Merge remote-tracking branch 'ryzomcore/atys' into feature/develop-atys

nel/src/gui/interface_element.cpp

@@ -1163,6 +1163,8 @@ namespace NLGUI
 		{
 			_Active = state;
 			invalidateCoords();
+			// force invalidate CViewText/CGroupTable inner elements
+			invalidateContent();
 		}
 	}
 

ryzom/client/src/interface_v3/group_map.cpp

@@ -2677,7 +2677,7 @@ void CGroupMap::setLandmarkFilter(const std::string &s)
 	_LandmarkFilter.clear();
 
 	if (!s.empty()) {
-		splitUCString(ucstring(toLower(s)), ucstring(" "), _LandmarkFilter);
+		splitUCString(ucstring::makeFromUtf8(toLower(s)), ucstring(" "), _LandmarkFilter);
 	}
 
 	// recreate landmarks

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;