1 files changed, 25 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 0a27e0a..504c193 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3531,6 +3531,17 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
         U32 teleport_flags;
         msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags);
         
+        U32 region_size_x = 256;
+        msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x);
+        U32 region_size_y = 256;
+        msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y);
+
+        //and a little hack for Second Life compatibility
+        if (region_size_y == 0 || region_size_x == 0)
+        {
+                region_size_x = 256;
+                region_size_y = 256;
+        }
         
         std::string seedCap;
         msg->getStringFast(_PREHASH_Info, _PREHASH_SeedCapability, seedCap);
@@ -3550,7 +3561,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 
         // Viewer trusts the simulator.
         gMessageSystem->enableCircuit(sim_host, TRUE);
-        LLViewerRegion* regionp =  LLWorld::getInstance()->addRegion(region_handle, sim_host);
+        LLViewerRegion* regionp =  LLWorld::getInstance()->addRegion(region_handle, sim_host, region_size_x, region_size_y);
 
 /*
         // send camera update to new region
@@ -3866,9 +3877,21 @@ void process_crossed_region(LLMessageSystem* msg, void**)
         std::string seedCap;
         msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, seedCap);
 
+        U32 region_size_x = 256;
+        msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x);
+        U32 region_size_y = 256;
+        msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y);
+
+        //and a little hack for Second Life compatibility
+        if (region_size_y == 0 || region_size_x == 0)
+        {
+                region_size_x = 256;
+                region_size_y = 256;
+        }
+
         send_complete_agent_movement(sim_host);
 
-        LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host);
+        LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host, region_size_x, region_size_y);
         regionp->setSeedCapability(seedCap);
 
         // Tell the LightShare handler that we have changed regions.