Merge remote-tracking branch 'origin/merge-into-atys' into yubo

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

@@ -1334,15 +1334,18 @@ void CGroupMap::checkCoords()
 	{
 		if( _AnimalLM[i] )
 		{
+			// update pos
+			sint32	px, py;
+			_AnimalPosStates[i]->getPos(px, py);
+			updateLMPosFromDBPos(_AnimalLM[i], px, py);
+
 			if (_IsIsland)
 			{
 				_AnimalLM[i]->setActive(false);
 			}
-			else
+			else if (_AnimalLM[i]->getActive())
 			{
-				_AnimalLM[i]->setActive(true);
 				// update texture from animal status
-				CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 				CCDBNodeLeaf	*statusNode = NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:PACK_ANIMAL:BEAST%d", i) + ":STATUS", false);
 				if (statusNode && ANIMAL_STATUS::isInStable((ANIMAL_STATUS::EAnimalStatus)statusNode->getValue32()) )
 				{
@@ -1373,11 +1376,6 @@ void CGroupMap::checkCoords()
 					case ANIMAL_TYPE::Demon:  sPrefix = "uiPATitleDemon";  break;
 				}
 				_AnimalLM[i]->setDefaultContextHelp(NLMISC::CI18N::get(sPrefix+toString(i+1)));
-
-				// update pos
-				sint32	px, py;
-				_AnimalPosStates[i]->getPos(px, py);
-				updateLMPosFromDBPos(_AnimalLM[i], px, py);
 			}
 		}
 	}

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

@@ -379,7 +379,10 @@ public:
 	{
 		if(!SoundMngr)
 		{
-			CInterfaceManager::getInstance()->messageBox (CI18N::get ("uiSoundDisabled"));
+			// Do not show warning on volume change as its restored at startup
+			if (Params.find("volume") == std::string::npos)
+				CInterfaceManager::getInstance()->messageBox (CI18N::get ("uiMP3SoundDisabled"));
+
 			return;
 		}
 

code/ryzom/client/src/main_loop_utilities.cpp

@@ -110,6 +110,9 @@ void updateFromClientCfg()
 	if (ClientCfg.BilinearUI != LastClientCfg.BilinearUI)
 		CViewRenderer::getInstance()->setBilinearFiltering(ClientCfg.BilinearUI);
 
+	CWidgetManager::getInstance()->setWindowSnapInvert(ClientCfg.WindowSnapInvert);
+	CWidgetManager::getInstance()->setWindowSnapDistance(ClientCfg.WindowSnapDistance);
+
 	//---------------------------------------------------
 	if (ClientCfg.WaitVBL != LastClientCfg.WaitVBL)
 	{