Applied Aimee's patch for VWR-12631: setting to adjust the maximum size of objects displayed on the minimap (MiniMapPrimMaxRadius)

1 files changed, 4 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 78398bb..9ccbf99 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -1030,6 +1030,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++)
         {
@@ -1045,6 +1046,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() )
                 {