diff options
Diffstat (limited to 'linden/indra/newview/llworld.cpp')
-rw-r--r-- | linden/indra/newview/llworld.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp index 525195d..13fc91c 100644 --- a/linden/indra/newview/llworld.cpp +++ b/linden/indra/newview/llworld.cpp | |||
@@ -172,11 +172,11 @@ LLViewerRegion* LLWorld::addRegion(const U64 ®ion_handle, const LLHost &host, | |||
172 | 172 | ||
173 | U32 iindex = 0; | 173 | U32 iindex = 0; |
174 | U32 jindex = 0; | 174 | U32 jindex = 0; |
175 | mWidth = region_size_x; | 175 | mWidth = region_size_x; |
176 | mWidthInMeters = mWidth * mScale; | 176 | mWidthInMeters = mWidth * mScale; |
177 | from_region_handle(region_handle, &iindex, &jindex); | 177 | from_region_handle(region_handle, &iindex, &jindex); |
178 | S32 x = (S32)(iindex/256); | 178 | S32 x = (S32)(iindex/256); |
179 | S32 y = (S32)(jindex/256); | 179 | S32 y = (S32)(jindex/256); |
180 | llinfos << "Adding new region (" << x << ":" << y << ")" << llendl; | 180 | llinfos << "Adding new region (" << x << ":" << y << ")" << llendl; |
181 | llinfos << "Host: " << host << llendl; | 181 | llinfos << "Host: " << host << llendl; |
182 | 182 | ||
@@ -1258,15 +1258,15 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data) | |||
1258 | // which simulator should we modify? | 1258 | // which simulator should we modify? |
1259 | LLHost sim(ip_u32, port); | 1259 | LLHost sim(ip_u32, port); |
1260 | 1260 | ||
1261 | U32 region_size_x = 256; | 1261 | U32 region_size_x = 256; |
1262 | msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeX, region_size_x); | 1262 | msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeX, region_size_x); |
1263 | U32 region_size_y = 256; | 1263 | U32 region_size_y = 256; |
1264 | msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeY, region_size_y); | 1264 | msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeY, region_size_y); |
1265 | 1265 | ||
1266 | if (region_size_y == 0 || region_size_x == 0) | 1266 | if (region_size_y == 0 || region_size_x == 0) |
1267 | { | 1267 | { |
1268 | region_size_x = 256; | 1268 | region_size_x = 256; |
1269 | region_size_y = 256; | 1269 | region_size_y = 256; |
1270 | } | 1270 | } |
1271 | 1271 | ||
1272 | // Viewer trusts the simulator. | 1272 | // Viewer trusts the simulator. |