1 files changed, 8 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index e0741e7..4961f48 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -874,6 +874,10 @@ void LLViewerObjectList::killObjects(LLViewerRegion *regionp)
                 if (objectp->mRegionp == regionp)
                 {
                         killObject(objectp);
+
+                        // invalidate region pointer. region will become invalid, but 
+                        // refcounted objects may survive the cleanDeadObjects() call below
+                        objectp->mRegionp = NULL;        
                 }
         }
 
@@ -1027,6 +1031,7 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
         LLColor4 group_own_below_water_color = 
                                                 gColors.getColor( "NetMapGroupOwnBelowWater" );
 
+        F32 max_radius = gSavedSettings.getF32("MiniMapPrimMaxRadius");
 
         for (S32 i = 0; i < mMapObjects.count(); i++)
         {
@@ -1042,6 +1047,9 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
 
                 F32 approx_radius = (scale.mV[VX] + scale.mV[VY]) * 0.5f * 0.5f * 1.3f;  // 1.3 is a fudge
 
+                // DEV-17370 - megaprims of size > 4096 cause lag.  (go figger.)
+                approx_radius = llmin(approx_radius, max_radius);
+
                 LLColor4U color = above_water_color;
                 if( objectp->permYouOwner() )
                 {