20 files changed, 178 insertions, 76 deletions
diff --git a/linden/indra/newview/llcloud.cpp b/linden/indra/newview/llcloud.cpp
index 3e9b86a..b325265 100644
--- a/linden/indra/newview/llcloud.cpp
+++ b/linden/indra/newview/llcloud.cpp
@@ -427,7 +427,7 @@ void LLCloudLayer::decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp)
        group_headerp->stride = group_headerp->patch_size;              // offset required to step up one row
        set_group_of_patch_header(group_headerp);
-        decode_patch_header(bitpack, &patch_header);
+        decode_patch_header(bitpack, &patch_header, FALSE);
        decode_patch(bitpack, gBuffer);
        decompress_patch(mDensityp, gBuffer, &patch_header); 
 }
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index d4ffe22..4880308 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -1244,10 +1244,10 @@ BOOL LLPanelRegionTextureInfo::sendUpdate()
        llinfos << "LLPanelRegionTextureInfo::sendUpdate()" << llendl;
        // Make sure user hasn't chosen wacky textures.
-        if (!validateTextureSizes())
+        //if (!validateTextureSizes())
-        {
+        //{
-                return FALSE;
+        //      return FALSE;
-        }
+        //}
        LLTextureCtrl* texture_ctrl;
        std::string buffer;
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index 98c4d06..96fd39b 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -710,7 +710,7 @@ void LLViewerParcelMgr::renderOneSegment(F32 x1, F32 y1, F32 x2, F32 y2, F32 hei
 {
        // HACK: At edge of last region of world, we need to make sure the region
        // resolves correctly so we can get a height value.
-        const F32 BORDER = REGION_WIDTH_METERS - 0.1f;
+        const F32 BORDER = regionp->getWidth() - 0.1f;
        F32 clamped_x1 = x1;
        F32 clamped_y1 = y1;
diff --git a/linden/indra/newview/llmapresponders.cpp b/linden/indra/newview/llmapresponders.cpp
index 9d974f2..b6b5c8a 100644
--- a/linden/indra/newview/llmapresponders.cpp
+++ b/linden/indra/newview/llmapresponders.cpp
@@ -120,6 +120,8 @@ void LLMapLayerResponder::result(const LLSD& result)
                
                        S32 x_regions = map_block["X"];
                        S32 y_regions = map_block["Y"];
+                        S32 size_x_regions = map_block["SizeX"];
+                        S32 size_y_regions = map_block["SizeY"];
                        std::string name = map_block["Name"];
                        S32 access = map_block["Access"];
                        S32 region_flags = map_block["RegionFlags"];
@@ -168,6 +170,8 @@ void LLMapLayerResponder::result(const LLSD& result)
                                LLWorldMap::getInstance()->mSimInfoMap[handle] = siminfo;
                                siminfo->mHandle = handle;
+                                siminfo->msizeX = size_x_regions;
+                                siminfo->msizeY = size_y_regions;
                                siminfo->mName.assign( name );
                                siminfo->mAccess = access;              /*Flawfinder: ignore*/
                                siminfo->mRegionFlags = region_flags;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 5a3a8ee..0b6d75f 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -368,6 +368,8 @@ bool idle_startup()
        static U64 first_sim_handle = 0;
        static LLHost first_sim;
        static std::string first_sim_seed_cap;
+        static U32 first_sim_size_x = 256;
+        static U32 first_sim_size_y = 256;
        static LLVector3 initial_sun_direction(1.f, 0.f, 0.f);
        static LLVector3 agent_start_position_region(10.f, 10.f, 10.f);         // default for when no space server
@@ -1620,6 +1622,16 @@ bool idle_startup()
                                first_sim_handle = to_region_handle(region_x, region_y);
                        }
                        
+                        text = LLUserAuth::getInstance()->getResponse("region_size_x");
+                        if(!text.empty()) {
+                                first_sim_size_x = strtoul(text.c_str(), NULL, 10);
+                                LLViewerParcelMgr::getInstance()->init(first_sim_size_x);
+                        }
+                        //region Y size is currently unused, major refactoring required. - Patrick Sapinski (2/10/2011)
+                        text = LLUserAuth::getInstance()->getResponse("region_size_y");
+                        if(!text.empty()) first_sim_size_y = strtoul(text.c_str(), NULL, 10);
+                        
                        const std::string look_at_str = LLUserAuth::getInstance()->getResponse("look_at");
                        if (!look_at_str.empty())
                        {
@@ -1915,7 +1927,7 @@ bool idle_startup()
                gAgent.initOriginGlobal(from_region_handle(first_sim_handle));
-                LLWorld::getInstance()->addRegion(first_sim_handle, first_sim);
+                LLWorld::getInstance()->addRegion(first_sim_handle, first_sim, first_sim_size_x, first_sim_size_y);
                LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(first_sim_handle);
                LL_INFOS("AppInit") << "Adding initial simulator " << regionp->getOriginGlobal() << LL_ENDL;
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index aaafe0d..66f8076 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -303,7 +303,7 @@ void LLSurface::initTextures()
                mWaterObjp = (LLVOWater *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_WATER, mRegionp);
                gPipeline.createObject(mWaterObjp);
                LLVector3d water_pos_global = from_region_handle(mRegionp->getHandle());
-                water_pos_global += LLVector3d(128.0, 128.0, DEFAULT_WATER_HEIGHT);
+                water_pos_global += LLVector3d(mRegionp->getWidth()/2, mRegionp->getWidth()/2, DEFAULT_WATER_HEIGHT);
                mWaterObjp->setPositionGlobal(water_pos_global);
        }
 }
@@ -356,8 +356,8 @@ void LLSurface::setOriginGlobal(const LLVector3d &origin_global)
        // Hack!
        if (mWaterObjp.notNull() && mWaterObjp->mDrawable.notNull())
        {
-                const F64 x = origin_global.mdV[VX] + 128.0;
+                const F64 x = origin_global.mdV[VX] + (F64)mRegionp->getWidth()/2;
-                const F64 y = origin_global.mdV[VY] + 128.0;
+                const F64 y = origin_global.mdV[VY] + (F64)mRegionp->getWidth()/2;
                const F64 z = mWaterObjp->getPositionGlobal().mdV[VZ];
                LLVector3d water_origin_global(x, y, z);
@@ -707,14 +707,22 @@ void LLSurface::decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, BOOL
        while (1)
        {
-                decode_patch_header(bitpack, &ph);
+                decode_patch_header(bitpack, &ph, b_large_patch);
                if (ph.quant_wbits == END_OF_PATCHES)
                {
                        break;
                }
-                i = ph.patchids >> 5;
+                if (b_large_patch)
-                j = ph.patchids & 0x1F;
+                {
+                        i = ph.patchids >> 16; //x
+                        j = ph.patchids & 0xFFFF; //y
+                }
+                else
+                {
+                        i = ph.patchids >> 5; //x
+                        j = ph.patchids & 0x1F; //y
+                }
                if ((i >= mPatchesPerEdge) || (j >= mPatchesPerEdge))
                {
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 9ebfd04..4de4768 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.
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 630da54..abe0e9f 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -137,6 +137,18 @@ LLViewerParcelMgr::LLViewerParcelMgr()
        mHoverParcel = new LLParcel();
        mCollisionParcel = new LLParcel();
+        mBlockedImage = gImageList.getImageFromFile("noentrylines.j2c");
+        mPassImage = gImageList.getImageFromFile("noentrypasslines.j2c");
+        init(256);
+}
+//moved this stuff out of the constructor and into a function that we can call again after we get the region size.
+//LLViewerParcelMgr needs to be changed so we either get an instance per region, or it handles various region sizes
+//on a single grid properly - Patrick Sapinski (2/10/2011)
+void LLViewerParcelMgr::init(F32 region_size)
+{
        mParcelsPerEdge = S32(  REGION_WIDTH_METERS / PARCEL_GRID_STEP_METERS );
        mHighlightSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)];
        resetSegments(mHighlightSegments);
@@ -144,10 +156,9 @@ LLViewerParcelMgr::LLViewerParcelMgr()
        mCollisionSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)];
        resetSegments(mCollisionSegments);
-        mBlockedImage = gImageList.getImageFromFile("noentrylines.j2c");
+        S32 mParcelOverLayChunks = region_size * region_size / (128 * 128);
-        mPassImage = gImageList.getImageFromFile("noentrypasslines.j2c");
+        S32 overlay_size = mParcelsPerEdge * mParcelsPerEdge / mParcelOverLayChunks;
-        S32 overlay_size = mParcelsPerEdge * mParcelsPerEdge / PARCEL_OVERLAY_CHUNKS;
        sPackedOverlay = new U8[overlay_size];
        mAgentParcelOverlay = new U8[mParcelsPerEdge * mParcelsPerEdge];
@@ -1351,8 +1362,7 @@ void LLViewerParcelMgr::processParcelOverlay(LLMessageSystem *msg, void **user)
                return;
        }
-        S32 parcels_per_edge = LLViewerParcelMgr::getInstance()->mParcelsPerEdge;
+        S32 expected_size = 1024; //parcels_per_edge * parcels_per_edge / PARCEL_OVERLAY_CHUNKS;
-        S32 expected_size = parcels_per_edge * parcels_per_edge / PARCEL_OVERLAY_CHUNKS;
        if (packed_overlay_size != expected_size)
        {
                llwarns << "Got parcel overlay size " << packed_overlay_size
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h
index 9bf6096..dcdea3c 100644
--- a/linden/indra/newview/llviewerparcelmgr.h
+++ b/linden/indra/newview/llviewerparcelmgr.h
@@ -82,6 +82,8 @@ public:
        LLViewerParcelMgr();
        ~LLViewerParcelMgr();
+        void init(F32 region_size);
        static void cleanupGlobals();
        BOOL    selectionEmpty() const;
diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp
index 0bcd8f3..a31f153 100644
--- a/linden/indra/newview/llviewerparceloverlay.cpp
+++ b/linden/indra/newview/llviewerparceloverlay.cpp
@@ -58,6 +58,7 @@ const U8  OVERLAY_IMG_COMPONENTS = 4;
 LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_width_meters)
 :       mRegion( region ),
        mParcelGridsPerEdge( S32( region_width_meters / PARCEL_GRID_STEP_METERS ) ),
+        mRegionSize(S32(region_width_meters)),
        mDirty( FALSE ),
        mTimeSinceLastUpdate(),
        mOverlayTextureIdx(-1),
@@ -299,7 +300,8 @@ void LLViewerParcelOverlay::uncompressLandOverlay(S32 chunk, U8 *packed_overlay)
 {
        // Unpack the message data into the ownership array
        S32     size    = mParcelGridsPerEdge * mParcelGridsPerEdge;
-        S32 chunk_size = size / PARCEL_OVERLAY_CHUNKS;
+        S32 mParcelOverLayChunks = mRegionSize * mRegionSize / (128 * 128);
+        S32 chunk_size = size / mParcelOverLayChunks;
        memcpy(mOwnership + chunk*chunk_size, packed_overlay, chunk_size);              /*Flawfinder: ignore*/
diff --git a/linden/indra/newview/llviewerparceloverlay.h b/linden/indra/newview/llviewerparceloverlay.h
index 9bed1dd..d3b5980 100644
--- a/linden/indra/newview/llviewerparceloverlay.h
+++ b/linden/indra/newview/llviewerparceloverlay.h
@@ -98,6 +98,7 @@ private:
        LLViewerRegion* mRegion;
        S32                             mParcelGridsPerEdge;
+        S32                             mRegionSize;
        LLPointer<LLImageGL> mTexture;
        LLPointer<LLImageRaw> mImageRaw;
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index a8047b8..4186362 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -65,6 +65,7 @@
 #include "llvoclouds.h"
 #include "llworld.h"
 #include "llspatialpartition.h"
+#include "llviewerparcelmgr.h"
 // Viewer object cache version, change if object update
 // format changes. JC
@@ -199,6 +200,8 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
        if (!gNoRender)
        {
                mParcelOverlay = new LLViewerParcelOverlay(this, region_width_meters);
+                //Re-init the parcel mgr for this sim
+                LLViewerParcelMgr::getInstance()->init(region_width_meters);
        }
        else
        {
diff --git a/linden/indra/newview/llvlmanager.cpp b/linden/indra/newview/llvlmanager.cpp
index 177093c..68b4d7b 100644
--- a/linden/indra/newview/llvlmanager.cpp
+++ b/linden/indra/newview/llvlmanager.cpp
@@ -57,21 +57,23 @@ LLVLManager::~LLVLManager()
 void LLVLManager::addLayerData(LLVLData *vl_datap, const S32 mesg_size)
 {
-        if (LAND_LAYER_CODE == vl_datap->mType)
+        if (LAND_LAYER_CODE == vl_datap->mType ||
-        {
+                AURORA_LAND_LAYER_CODE == vl_datap->mType)
-                mLandBits += mesg_size * 8;
+        {
-        }
+                mLandBits += mesg_size * 8;
-        else if (WIND_LAYER_CODE == vl_datap->mType)
+        }
-        {
+        else if (WIND_LAYER_CODE == vl_datap->mType ||
-                mWindBits += mesg_size * 8;
+                AURORA_WIND_LAYER_CODE == vl_datap->mType)
-        }
+        {
-        else if (CLOUD_LAYER_CODE == vl_datap->mType)
+                mWindBits += mesg_size * 8;
-        {
+        }
-                mCloudBits += mesg_size * 8;
+        else if (CLOUD_LAYER_CODE == vl_datap->mType)
-        }
+        {
-        else
+                mCloudBits += mesg_size * 8;
-        {
+        }
-                llerrs << "Unknown layer type!" << (S32)vl_datap->mType << llendl;
+        else
+        {
+                llerrs << "Unknown layer type!" << (S32)vl_datap->mType << llendl;
        }
        mPacketData.put(vl_datap);
@@ -90,18 +92,23 @@ void LLVLManager::unpackData(const S32 num_packets)
                LLGroupHeader goph;
                decode_patch_group_header(bit_pack, &goph);
-                if (LAND_LAYER_CODE == datap->mType)
+                if (LAND_LAYER_CODE == datap->mType)
-                {
+                {
-                        datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE);
+                        datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE);
-                }
+                }
-                else if (WIND_LAYER_CODE == datap->mType)
+                else if (AURORA_LAND_LAYER_CODE == datap->mType)
-                {
+                {
-                        datap->mRegionp->mWind.decompress(bit_pack, &goph);
+                        datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, TRUE);
+                }
-                }
+                else if (WIND_LAYER_CODE == datap->mType ||
-                else if (CLOUD_LAYER_CODE == datap->mType)
+                        AURORA_WIND_LAYER_CODE == datap->mType)
-                {
+                {
-                        datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph);
+                        datap->mRegionp->mWind.decompress(bit_pack, &goph);
+                }
+                else if (CLOUD_LAYER_CODE == datap->mType ||
+                        AURORA_CLOUD_LAYER_CODE == datap->mType)
+                {
+                        datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph);
                }
        }
diff --git a/linden/indra/newview/llvowater.cpp b/linden/indra/newview/llvowater.cpp
index c66295a..8af9e4a 100644
--- a/linden/indra/newview/llvowater.cpp
+++ b/linden/indra/newview/llvowater.cpp
@@ -74,7 +74,7 @@ LLVOWater::LLVOWater(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regi
 {
        // Terrain must draw during selection passes so it can block objects behind it.
        mbCanSelect = FALSE;
-        setScale(LLVector3(256.f, 256.f, 0.f)); // Hack for setting scale for bounding boxes/visibility.
+        setScale(LLVector3(mRegionp->getWidth(), mRegionp->getWidth(), 0.f)); // Hack for setting scale for bounding boxes/visibility.
        mUseTexture = TRUE;
        mIsEdgePatch = FALSE;
diff --git a/linden/indra/newview/llwind.cpp b/linden/indra/newview/llwind.cpp
index ae98bea..3dcbdf6 100644
--- a/linden/indra/newview/llwind.cpp
+++ b/linden/indra/newview/llwind.cpp
@@ -120,12 +120,12 @@ void LLWind::decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp)
        set_group_of_patch_header(group_headerp);
        // X component
-        decode_patch_header(bitpack, &patch_header);
+        decode_patch_header(bitpack, &patch_header, FALSE);
        decode_patch(bitpack, buffer);
        decompress_patch(mVelX, buffer, &patch_header);
        // Y component
-        decode_patch_header(bitpack, &patch_header);
+        decode_patch_header(bitpack, &patch_header, FALSE);
        decode_patch(bitpack, buffer);
        decompress_patch(mVelY, buffer, &patch_header);
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 x = (S32)(iindex/256);
-        S32 y = (S32)(jindex/mWidth);
+        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;
diff --git a/linden/indra/newview/llworld.h b/linden/indra/newview/llworld.h
index 964729d..5dbef6d 100644
--- a/linden/indra/newview/llworld.h
+++ b/linden/indra/newview/llworld.h
@@ -71,7 +71,7 @@ public:
        LLWorld();
        void destroyClass();
-        LLViewerRegion* addRegion(const U64 &region_handle, const LLHost &host);
+        LLViewerRegion* addRegion(const U64 &region_handle, const LLHost &host, const U32 &region_size_x, const U32 &region_size_y);
                // safe to call if already present, does the "right thing" if
                // hosts are same, or if hosts are different, etc...
        void                    removeRegion(const LLHost &host);
@@ -171,12 +171,12 @@ private:
        region_list_t   mCulledRegionList;
        // Number of points on edge
-        static const U32 mWidth;
+        static U32 mWidth;
        // meters/point, therefore mWidth * mScale = meters per edge
        static const F32 mScale;
-        static const F32 mWidthInMeters;
+        static F32 mWidthInMeters;
        F32 mLandFarClip;                                       // Far clip distance for land.
        LLPatchVertexArray              mLandPatch;
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index 3ada36f..ead72fa 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -237,16 +237,27 @@ LLSimInfo* LLWorldMap::simInfoFromPosGlobal(const LLVector3d& pos_global)
        return simInfoFromHandle(handle);
 }
-LLSimInfo* LLWorldMap::simInfoFromHandle(const U64 handle)
+LLSimInfo* LLWorldMap::simInfoFromHandle(const U64 findhandle)
 {
-        sim_info_map_t::iterator it = mSimInfoMap.find(handle);
+        std::map<U64, LLSimInfo*>::const_iterator it;
-        if (it != mSimInfoMap.end())
+        for (it = LLWorldMap::getInstance()->mSimInfoMap.begin(); it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
-        {
+        {
-                LLSimInfo* sim_info = (*it).second;
+                const U64 handle = (*it).first;
-                if (sim_info)
+                LLSimInfo* info = (*it).second;
-                {
+                if(handle == findhandle)
-                        return sim_info;
+                {
-                }
+                        return info;
+                }
+                U32 x = 0, y = 0;
+                from_region_handle(findhandle, &x, &y);
+                U32 checkRegionX, checkRegionY;
+                from_region_handle(handle, &checkRegionX, &checkRegionY);
+        if(x > checkRegionX && x < (checkRegionX + info->msizeX) &&
+                        y > checkRegionY && y < (checkRegionY + info->msizeY))
+                {
+                        return info;
+                }
        }
        return NULL;
 }
diff --git a/linden/indra/newview/llworldmap.h b/linden/indra/newview/llworldmap.h
index b7089f3..6725f91 100644
--- a/linden/indra/newview/llworldmap.h
+++ b/linden/indra/newview/llworldmap.h
@@ -81,6 +81,8 @@ public:
 public:
        U64 mHandle;
+        S32 msizeX;
+        S32 msizeY;
        std::string mName;
        F64 mAgentsUpdateTime;
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 443ee74..51de598 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -471,8 +471,8 @@ void LLWorldMapView::draw()
                // When the view isn't panned, 0,0 = center of rectangle
                F32 bottom =    sPanY + half_height + relative_y;
                F32 left =              sPanX + half_width + relative_x;
-                F32 top =               bottom + sMapScale ;
+                F32 top =               bottom+ (sMapScale * info->msizeY / REGION_WIDTH_METERS);
-                F32 right =             left + sMapScale ;
+                F32 right =             left + (sMapScale * info->msizeY / REGION_WIDTH_METERS);
                // Switch to world map texture (if available for this region) if either:
                // 1. Tiles are zoomed out small enough, or
@@ -567,17 +567,21 @@ void LLWorldMapView::draw()
                center_global.mdV[VX] += 128.0;
                center_global.mdV[VY] += 128.0;
-                S32 draw_size = llround(sMapScale);
+                S32 x_draw_size = llround(sMapScale);
+                S32 y_draw_size = llround(sMapScale);
+                x_draw_size *= info->msizeX / REGION_WIDTH_METERS;
+                y_draw_size *= info->msizeY / REGION_WIDTH_METERS;
+                
                if (simimage != NULL)
                {
                        simimage->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP);
-                        simimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
+                        simimage->setKnownDrawSize(llround(x_draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(y_draw_size * LLUI::sGLScaleFactor.mV[VY]));
                }
                if (overlayimage != NULL)
                {
                        overlayimage->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP);
-                        overlayimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
+                        overlayimage->setKnownDrawSize(llround(x_draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(y_draw_size * LLUI::sGLScaleFactor.mV[VY]));
                }
                        
 //              LLTextureView::addDebugImage(simimage);