Merge in Var Sized Regions into the Imprudence Experimental.

1 files changed, 3 insertions, 1 deletions

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*/