From f41f7cb607b57a2ba78412e75e754d96a60a06fc Mon Sep 17 00:00:00 2001
From: leyla_linden <none@none>
Date: Wed, 16 Feb 2011 15:24:11 -0800
Subject: SH-512 [REGRESSION] Linden trees scale up to 200m on Mesh regions
 SH-943 10 meters maximum Prim/Mesh size in latest Mesh Viewers

---
 indra/newview/llpanelobject.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llpanelobject.cpp')

diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 8fa6beb474..42da966b92 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -1934,7 +1934,8 @@ void LLPanelObject::refresh()
 	getChildView("Physics Density")->setVisible(enable_mesh);
 	getChildView("Physics Restitution")->setVisible(enable_mesh);
 
-	F32 max_scale = DEFAULT_MAX_PRIM_SCALE_NO_MESH;
+	F32 max_scale = get_default_max_prim_scale(LLPickInfo::isFlora(mObject));
+
 	getChild<LLSpinCtrl>("Scale X")->setMaxValue(max_scale);
 	getChild<LLSpinCtrl>("Scale Y")->setMaxValue(max_scale);
 	getChild<LLSpinCtrl>("Scale Z")->setMaxValue(max_scale);
-- 
cgit v1.2.3