diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 668dcd519..9485a7712 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4520,11 +4520,14 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 	// Viewer trusts the simulator.
 	gMessageSystem->enableCircuit(sim_host, TRUE);
 // <FS:CR> Aurora Sim
-	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);
-	LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y);
+	if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
+	{
+		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);
+		LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y);
+	}
 // </FS:CR> Aurora Sim
 	LLViewerRegion* regionp =  LLWorld::getInstance()->addRegion(region_handle, sim_host);
 
@@ -4852,11 +4855,14 @@ void process_crossed_region(LLMessageSystem* msg, void**)
 	send_complete_agent_movement(sim_host);
 
 // <FS:CR> Aurora Sim
-	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);
-	LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y);
+	if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
+	{
+		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);
+		LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y);
+	}
 // </FS:CR> Aurora Sim
 	LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host);
 	regionp->setSeedCapability(seedCap);
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 8e1b1e4be..854bfa3dd 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -62,6 +62,7 @@
 #include "pipeline.h"
 #include "llappviewer.h"		// for do_disconnect()
 #include "llpacketring.h"
+#include "hippogridmanager.h"
 
 #include <deque>
 #include <queue>
@@ -1376,11 +1377,14 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data)
 	// Viewer trusts the simulator.
 	msg->enableCircuit(sim, TRUE);
 // <FS:CR> Aurora Sim
-	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);
-	LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y);
+	if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
+	{
+		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);
+		LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y);
+	}
 // </FS:CR> Aurora Sim
 	LLWorld::getInstance()->addRegion(handle, sim);