aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmapresponders.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-03-19 14:13:38 -0700
committerMcCabe Maxsted2011-03-19 14:13:38 -0700
commitc144b6636342a5e2b4b8bce3e714c96b593f20aa (patch)
tree63f263a8641238ac3ce10974f668e791e869bd3d /linden/indra/newview/llmapresponders.cpp
parentMerge remote-tracking branch 'armin/exp' into exp (diff)
parentPackage both libz.so.1 and libz.so (symlink) on Linux32. (IMP-790) (diff)
downloadmeta-impy-c144b6636342a5e2b4b8bce3e714c96b593f20aa.zip
meta-impy-c144b6636342a5e2b4b8bce3e714c96b593f20aa.tar.gz
meta-impy-c144b6636342a5e2b4b8bce3e714c96b593f20aa.tar.bz2
meta-impy-c144b6636342a5e2b4b8bce3e714c96b593f20aa.tar.xz
Merge remote-tracking branch 'jacek/exp' into exp
Diffstat (limited to 'linden/indra/newview/llmapresponders.cpp')
-rw-r--r--linden/indra/newview/llmapresponders.cpp4
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)
120 120
121 S32 x_regions = map_block["X"]; 121 S32 x_regions = map_block["X"];
122 S32 y_regions = map_block["Y"]; 122 S32 y_regions = map_block["Y"];
123 S32 size_x_regions = map_block["SizeX"];
124 S32 size_y_regions = map_block["SizeY"];
123 std::string name = map_block["Name"]; 125 std::string name = map_block["Name"];
124 S32 access = map_block["Access"]; 126 S32 access = map_block["Access"];
125 S32 region_flags = map_block["RegionFlags"]; 127 S32 region_flags = map_block["RegionFlags"];
@@ -168,6 +170,8 @@ void LLMapLayerResponder::result(const LLSD& result)
168 LLWorldMap::getInstance()->mSimInfoMap[handle] = siminfo; 170 LLWorldMap::getInstance()->mSimInfoMap[handle] = siminfo;
169 171
170 siminfo->mHandle = handle; 172 siminfo->mHandle = handle;
173 siminfo->msizeX = size_x_regions;
174 siminfo->msizeY = size_y_regions;
171 siminfo->mName.assign( name ); 175 siminfo->mName.assign( name );
172 siminfo->mAccess = access; /*Flawfinder: ignore*/ 176 siminfo->mAccess = access; /*Flawfinder: ignore*/
173 siminfo->mRegionFlags = region_flags; 177 siminfo->mRegionFlags = region_flags;