From d26f1bb88137454f3c8781f50ee42c4a7e9fe70f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 12 Feb 2014 18:03:12 +0100 Subject: [PATCH] Variable region size for OpenSim, not Aurora Sim only --- indra/newview/llviewermessage.cpp | 4 ++-- indra/newview/llworld.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index afac5dbeab..bf6d680a3a 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4879,7 +4879,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**) U32 region_size_y = 256; #ifdef OPENSIM - if (LLGridManager::getInstance()->isInAuroraSim()) + if (LLGridManager::getInstance()->isInOpenSim()) { msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x); msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y); @@ -5269,7 +5269,7 @@ void process_crossed_region(LLMessageSystem* msg, void**) U32 region_size_y = 256; #ifdef OPENSIM - if (LLGridManager::getInstance()->isInAuroraSim()) + if (LLGridManager::getInstance()->isInOpenSim()) { msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x); msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y); diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index f72c2472c7..30b34e0f66 100755 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1507,7 +1507,7 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data) U32 region_size_y = 256; #ifdef OPENSIM - if (LLGridManager::getInstance()->isInAuroraSim()) + if (LLGridManager::getInstance()->isInOpenSim()) { msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeX, region_size_x); msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeY, region_size_y);