1 files changed, 20 insertions, 7 deletions

diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 7866bf8..525195d 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -80,12 +80,12 @@ const S32 WORLD_PATCH_SIZE = 16;
 
 extern LLColor4U MAX_WATER_COLOR;
 
-const U32 LLWorld::mWidth = 256;
+U32 LLWorld::mWidth = 256;
 
 // meters/point, therefore mWidth * mScale = meters per edge
 const F32 LLWorld::mScale = 1.f;
 
-const F32 LLWorld::mWidthInMeters = mWidth * mScale;
+F32 LLWorld::mWidthInMeters = mWidth * mScale;
 
 //
 // Functions
@@ -140,7 +140,7 @@ F32	LLWorld::getRegionMaxHeight() const
         return gHippoLimits->getMaxHeight();
 }
 
-LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
+LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host, const U32 &region_size_x, const U32 &region_size_y)
 {
         LLMemType mt(LLMemType::MTYPE_REGIONS);
         
@@ -172,9 +172,11 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
 
         U32 iindex = 0;
         U32 jindex = 0;
+        mWidth = region_size_x;

+        mWidthInMeters = mWidth * mScale;

         from_region_handle(region_handle, &iindex, &jindex);
-        S32 x = (S32)(iindex/mWidth);
-        S32 y = (S32)(jindex/mWidth);
+        S32 x = (S32)(iindex/256);

+        S32 y = (S32)(jindex/256);

         llinfos << "Adding new region (" << x << ":" << y << ")" << llendl;
         llinfos << "Host: " << host << llendl;
 
@@ -902,7 +904,7 @@ void LLWorld::updateWaterObjects()
         }
 
         // Region width in meters.
-        S32 const rwidth = (S32)REGION_WIDTH_U32;
+        S32 const rwidth = (S32)getRegionWidthInMeters();
 
         // The distance we might see into the void
         // when standing on the edge of a region, in meters.
@@ -1256,9 +1258,20 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data)
         // which simulator should we modify?
         LLHost sim(ip_u32, port);
 
+        U32 region_size_x = 256;

+        msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeX, region_size_x);

+        U32 region_size_y = 256;

+        msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeY, region_size_y);

+

+        if (region_size_y == 0 || region_size_x == 0)

+        {

+                region_size_x = 256;

+                region_size_y = 256;

+        }
+
         // Viewer trusts the simulator.
         msg->enableCircuit(sim, TRUE);
-        LLWorld::getInstance()->addRegion(handle, sim);
+        LLWorld::getInstance()->addRegion(handle, sim, region_size_x, region_size_y);
 
         // give the simulator a message it can use to get ip and port
         llinfos << "simulator_enable() Enabling " << sim << " with code " << msg->getOurCircuitCode() << llendl;