Merge with develop

code/nel/src/gui/group_editbox.cpp

@@ -953,7 +953,6 @@ namespace NLGUI
 			maxPos = _CursorPos;
 		}
 
-		nlinfo("%d, %d", minPos, maxPos);
 		if (replace)
 		{
 			_InputString = _InputString.substr(0, minPos) + toAdd + _InputString.substr(maxPos);

code/nel/tools/3d/textures_optimizer/main.cpp

@@ -186,7 +186,7 @@ int main(int argc, char **argv)
 
 		if (hasAlpha && bitmap.isAlphaUniform(&alpha))
 		{
-			std::cout << InputFilenames[i] << " (image with uniform alpha channel " << alpha << ")" << std::endl;
+			std::cout << InputFilenames[i] << " (image with uniform alpha channel " << (sint)alpha << ")" << std::endl;
 
 			if (FixAlpha && (alpha == 0 || alpha == 255))
 			{

code/nel/tools/3d/tga_2_dds/tga2dds.cpp

@@ -513,7 +513,7 @@ int main(int argc, char **argv)
 	std::string::size_type pos = inputFileName.rfind(".");
 	if (pos == std::string::npos)
 	{
-		// name whithout extension
+		// name without extension
 		userColorFileName = inputFileName + "_usercolor";
 	}
 	else

code/ryzom/client/src/client_cfg.cpp

@@ -502,6 +502,7 @@ CClientConfig::CClientConfig()
 
 	Sleep				= -1;						// Default : client does not sleep.
 	ProcessPriority		= 0;						// Default : NORMAL
+	CPUMask				= 0;						// Default : auto detection
 	ShowPath			= false;					// Default : do not display the path.
 	DrawBoxes			= false;					// Default : Do not draw the selection.
 
@@ -1476,6 +1477,8 @@ void CClientConfig::setValues()
 	READ_INT_FV(Sleep)
 	// ProcessPriority
 	READ_INT_FV(ProcessPriority)
+	// CPUMask
+	READ_INT_FV(CPUMask)
 	// ShowPath : Get the ShowPath value.
 	READ_BOOL_DEV(ShowPath)
 	// UserSheet : Get the sheet to used for the use rin Local mode.

code/ryzom/client/src/client_cfg.h

@@ -421,6 +421,8 @@ struct CClientConfig
 	sint			Sleep;
 	/// Force process priority
 	sint			ProcessPriority;
+	/// CPU Mask
+	sint			CPUMask;
 	// To show/hide the entities path
 	bool			ShowPath;
 	/// Draw the Boxes used for the selection.

code/ryzom/common/src/game_share/fame.cpp

@@ -705,7 +705,7 @@ sint32	CFameInterface::getFameIndexed(const CEntityId &entityId, uint32 factionI
 		if (!returnUnknownValue && fame == NO_FAME)
 			fame = 0;
 
-		return sint32(fame);
+		return fame;
 	}
 }
 

code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.h

@@ -143,7 +143,7 @@ public:
 	// Fame system
 	//  These take clans as parameters, restricted by call.
 	//  These return the proper fame values, or NO_FAME if there's an error.
-	// - GgtStartFame: playerClan must be a Civilization, targetClan must be any non-neutral clan
+	// - getStartFame: playerClan must be a Civilization, targetClan must be any non-neutral clan
 	sint32 getStartFame(PVP_CLAN::TPVPClan playerClan, PVP_CLAN::TPVPClan targetClan);
 	// - getMaxFameByClan: playerClan must be Neutral or the same type (Cult or Clan) as targetClan,
 	//   targetClan must be any non-neutral clan.

code/ryzom/server/src/entities_game_service/guild_manager/guild_member_module.cpp

@@ -339,7 +339,7 @@ void CGuildMemberModule::_inviteCharacterInGuild(CGuildCharProxy& invitor, CGuil
 		SM_STATIC_PARAMS_2( params, STRING_MANAGER::player, STRING_MANAGER::faction );
 		params[0].setEIdAIAlias( target.getId(), CAIAliasTranslator::getInstance()->getAIAlias( target.getId()) );
 		params[1].Enum = PVP_CLAN::getFactionIndex(invitedAllegiance.first);
-		invitor.sendSystemMessage("GUILD_ICOMPATIBLE_ALLEGIANCE",params);
+		invitor.sendSystemMessage("GUILD_INCOMPATIBLE_ALLEGIANCE",params);
 		return;
 	}
 
@@ -348,7 +348,7 @@ void CGuildMemberModule::_inviteCharacterInGuild(CGuildCharProxy& invitor, CGuil
 		SM_STATIC_PARAMS_2( params, STRING_MANAGER::player, STRING_MANAGER::faction );
 		params[0].setEIdAIAlias( target.getId(), CAIAliasTranslator::getInstance()->getAIAlias( target.getId()) );
 		params[1].Enum = PVP_CLAN::getFactionIndex(invitedAllegiance.second);
-		invitor.sendSystemMessage("GUILD_ICOMPATIBLE_ALLEGIANCE",params);
+		invitor.sendSystemMessage("GUILD_INCOMPATIBLE_ALLEGIANCE",params);
 		return;
 	}
 

code/ryzom/server/src/frontend_service/fe_receive_sub.cpp

@@ -75,7 +75,7 @@ extern void flushMessagesToSend();
 void cbGwTrDisconnection ( TClientId clientId );
 
 
-extern CVariable<string>	SaveShardRoot;
+extern CVariable<string>	SaveShardRootGameShare;
 extern CVariable<bool>		VerboseFEStatsTime;