Merge with develop

code/ryzom/client/client_default.cfg

@@ -211,6 +211,8 @@ FXAA_ps1	= 1;
 FXAA_ps2	= 1;
 FXAA_ps3	= 1;
 
+AnisotropicFilter	= 0;
+
 Bloom = 1;
 Bloom_ps0	= 0;
 Bloom_ps1	= 1;

code/ryzom/client/data/gamedev/interfaces_v3/game_config.lua

@@ -151,6 +151,10 @@ function game:configInit()
 		langNb = 2;
 	elseif (lang == 'fr') then
 		langNb = 1;
+	elseif (lang == 'ru') then
+		langNb = 3;
+	elseif (lang == 'es') then
+		langNb = 4;
 	end
 
 	-- force observers call

code/ryzom/client/data/gamedev/interfaces_v3/player.xml

@@ -218,7 +218,7 @@
   <!-- ************** -->
   <!-- CURRENT ACTION -->
   <!-- ************** -->
-  <!-- Must pass through an other DB, to allow multiple isntances of the action bar template -->
+  <!-- Must pass through an other DB, to allow multiple instances of the action bar template -->
   <variable entry="UI:PHRASE:ACT_BAR_LEN"
             type="sint32"
             value="0" />

code/ryzom/client/macosx/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
 	<key>CFBundleGetInfoString</key>
@@ -27,13 +29,21 @@
 	<key>NSHumanReadableCopyright</key>
 	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}.0</string>
+	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
 	<key>LSFileQuarantineEnabled</key>
 	<true/>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
 	<true/>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>en</string>
+		<string>fr</string>
+		<string>de</string>
+		<string>ru</string>
+		<string>es</string>
+	</array>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.role-playing-games</string>
 </dict>

code/ryzom/client/src/init_main_loop.cpp

@@ -182,7 +182,6 @@ struct CStatThread : public NLMISC::IRunnable
 		CURL *curl = curl_easy_init();
 		if(!curl) return;
 		curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
-//		curl_easy_setopt(curl, CURLOPT_USERAGENT, "unknown");
 		curl_easy_setopt(curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)");
 		curl_easy_setopt(curl, CURLOPT_REFERER, string("http://www.ryzom.com/" + referer).c_str());
 		curl_easy_setopt(curl, CURLOPT_URL, url.c_str());

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

@@ -3517,6 +3517,7 @@ class CHandlerGameConfigApply : public IActionHandler
 		}
 
 		// **** Apply Anisotropic Filtering
+		// read value from DB, it's a combo so value is the index of text
 		sint nAnisotropic = NLGUI::CDBManager::getInstance()->getDbProp( GAME_CONFIG_ANISOTROPIC_DB )->getValue32();
 
 		if (nAnisotropic >= 0)
@@ -3526,24 +3527,22 @@ class CHandlerGameConfigApply : public IActionHandler
 			// compute the real anisotropic value
 			if (nAnisotropic > 0)
 			{
-				anisotropic = 1;
+				anisotropic = 2;
 
-				for(size_t i = 0; i < nAnisotropic; ++i)
+				for(size_t i = 1; i < nAnisotropic; ++i)
 				{
 					anisotropic <<= 1;
 				}
 			}
 
-
 			if (ClientCfg.AnisotropicFilter != anisotropic)
 			{
 				ClientCfg.AnisotropicFilter = anisotropic;
-				ClientCfg.writeInt("AnisotropicFilter", anisotropic);
+				ClientCfg.writeInt("AnisotropicFilter", ClientCfg.AnisotropicFilter);
 				requestReboot = true;
 			}
 		}
 
-
 		// *** Apply the Screen AR
 		// since already set in the config file, need only to bkup the current version
 		CHandlerGameConfigInit::BkupScreenAspectRatio= ClientCfg.ScreenAspectRatio;

code/ryzom/client/src/main_loop_utilities.cpp

@@ -237,6 +237,12 @@ void updateFromClientCfg()
 		}
 	}
 
+	//---------------------------------------------------
+	if (ClientCfg.AnisotropicFilter != LastClientCfg.AnisotropicFilter)
+	{
+		Driver->setAnisotropicFilter(ClientCfg.AnisotropicFilter);
+	}
+
 	//---------------------------------------------------
 	if (ClientCfg.FXAA != LastClientCfg.FXAA)
 	{