diff -r 5d69e36a53ee indra/newview/app_settings/settings.xml
--- a/indra/newview/app_settings/settings.xml	Wed Dec 22 14:06:46 2010 -0800
+++ b/indra/newview/app_settings/settings.xml	Wed Dec 22 22:11:43 2010 -0800
@@ -4780,6 +4780,17 @@
       <key>Value</key>
       <string>http://map.secondlife.com.s3.amazonaws.com/</string>
     </map>
+    <key>CurrentMapServerURL</key>
+    <map>
+      <key>Comment</key>
+      <string>Current Session World map URL</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string></string>
+    </map>
     <key>MapShowEvents</key>
     <map>
       <key>Comment</key>
diff -r 5d69e36a53ee indra/newview/llstartup.cpp
--- a/indra/newview/llstartup.cpp	Wed Dec 22 14:06:46 2010 -0800
+++ b/indra/newview/llstartup.cpp	Wed Dec 22 22:11:43 2010 -0800
@@ -3095,7 +3095,16 @@
 	std::string map_server_url = response["map-server-url"];
 	if(!map_server_url.empty())
 	{
-		gSavedSettings.setString("MapServerURL", map_server_url); 
+		// We got an answer from the grid -> use that for map for the current session
+		gSavedSettings.setString("CurrentMapServerURL", map_server_url); 
+		LL_INFOS("LLStartup") << "map-server-url : we got an answer from the grid : " << map_server_url << LL_ENDL;
+	}
+	else
+	{
+		// No answer from the grid -> use the default setting for current session 
+		map_server_url = gSavedSettings.getString("MapServerURL"); 
+		gSavedSettings.setString("CurrentMapServerURL", map_server_url); 
+		LL_INFOS("LLStartup") << "map-server-url : no map-server-url answer, we use the default setting for the map : " << map_server_url << LL_ENDL;
 	}
 	
 	// Default male and female avatars allowing the user to choose their avatar on first login.
diff -r 5d69e36a53ee indra/newview/llworldmipmap.cpp
--- a/indra/newview/llworldmipmap.cpp	Wed Dec 22 14:06:46 2010 -0800
+++ b/indra/newview/llworldmipmap.cpp	Wed Dec 22 22:11:43 2010 -0800
@@ -181,8 +181,7 @@
 LLPointer<LLViewerFetchedTexture> LLWorldMipmap::loadObjectsTile(U32 grid_x, U32 grid_y, S32 level)
 {
 	// Get the grid coordinates
-	std::string imageurl = gSavedSettings.getString("MapServerURL") + llformat("map-%d-%d-%d-objects.jpg", level, grid_x, grid_y);
-
+	std::string imageurl = gSavedSettings.getString("CurrentMapServerURL") + llformat("map-%d-%d-%d-objects.jpg", level, grid_x, grid_y);
 
 	// DO NOT COMMIT!! DEBUG ONLY!!!
 	// Use a local jpeg for every tile to test map speed without S3 access