Merge remote-tracking branch 'mccabe/exp' into weekly

Conflicts:  (Keeping these around as a record, there was some strangeness.
	.gitignore
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llfloaterregioninfo.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/skins/default/html/en-us/loading-error/index.html
	linden/indra/newview/skins/default/html/en-us/loading/loading.html
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/install.xml

1 files changed, 4 insertions, 0 deletions

diff --git a/linden/indra/newview/llmapresponders.cpp b/linden/indra/newview/llmapresponders.cpp
index 9d974f2..31c04a3 100644
--- a/linden/indra/newview/llmapresponders.cpp
+++ b/linden/indra/newview/llmapresponders.cpp
@@ -120,6 +120,8 @@ void LLMapLayerResponder::result(const LLSD& result)
                 
                         S32 x_regions = map_block["X"];
                         S32 y_regions = map_block["Y"];
+                        S32 size_x_regions = map_block["SizeX"];
+                        S32 size_y_regions = map_block["SizeY"];
                         std::string name = map_block["Name"];
                         S32 access = map_block["Access"];
                         S32 region_flags = map_block["RegionFlags"];
@@ -168,6 +170,8 @@ void LLMapLayerResponder::result(const LLSD& result)
                                 LLWorldMap::getInstance()->mSimInfoMap[handle] = siminfo;
 
                                 siminfo->mHandle = handle;
+                                siminfo->msizeX = size_x_regions;
+                                siminfo->msizeY = size_y_regions;
                                 siminfo->mName.assign( name );
                                 siminfo->mAccess = access;              /*Flawfinder: ignore*/
                                 siminfo->mRegionFlags = region_flags;