Merge remote-tracking branch 'origin/fixes' into yubo

code/ryzom/client/src/interface_v3/group_map.cpp

@@ -2472,7 +2472,8 @@ void CGroupMap::updateMatchedLandmarks()
 		std::vector<std::pair<string,string> > params;
 		params.clear();
 		params.push_back(std::pair<string,string>("id", toString("lm%d", k)));
-		params.push_back(std::pair<string,string>("tooltip", _MatchedLandmarks[k].Title.toUtf8()));
+		// ctrl base expects utf8 string to start with "u:"
+		params.push_back(std::pair<string,string>("tooltip", "u:" + _MatchedLandmarks[k].Title.toUtf8()));
 		params.push_back(std::pair<string,string>("index", toString(k)));
 
 		CInterfaceGroup *g = CWidgetManager::getInstance()->getParser()->createGroupInstance("lm_search_result", pL->getId(), params);
@@ -2680,7 +2681,7 @@ void CGroupMap::setLandmarkFilter(const std::string &s)
 	if (!s.empty()) {
 		ucstring ucs;
 		ucs.fromUtf8(s);
-		splitUCString(toLower(s), ucstring(" "), _LandmarkFilter);
+		splitUCString(toLower(ucs), ucstring(" "), _LandmarkFilter);
 	}
 
 	// recreate landmarks

code/ryzom/client/src/login_patch.cpp

@@ -1280,6 +1280,19 @@ void CPatchManager::readDescFile(sint32 nVersion)
 
 		CBNPFileSet &bnpFS = const_cast<CBNPFileSet &>(DescFile.getFiles());
 
+		// TODO: .ref files are expected to follow platform category naming (they are in 'main' category)
+		std::set<std::string>::const_iterator it;
+		for(it = forceRemovePatchCategories.begin(); it != forceRemovePatchCategories.end(); ++it)
+		{
+			std::string name = *it;
+			std::string::size_type pos = name.find("_");
+			if (pos != std::string::npos)
+			{
+				name = name.substr(pos+1) + "_.ref";
+				bnpFS.removeFile(name);
+			}
+		}
+
 		for (cat = 0; cat < DescFile.getCategories().categoryCount();)
 		{
 			const CBNPCategory &bnpCat = DescFile.getCategories().getCategory(cat);
@@ -2967,7 +2980,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 				PatchSizeProgress += rFTP.PatcheSizes[j];
 				currentPatchedSize += rFTP.PatcheSizes[j];
 			}
-
+		}
 			if (tmpSourceName != DestinationName)
 			{
 				pPM->deleteFile(SourceName, false, false); // File can exists if bad BNP loading
@@ -2982,7 +2995,6 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 				}
 			}
 	}
-	}
 	else
 	{
 		PatchSizeProgress += totalPatchSize;