summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobject.cpp
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-02-16 15:24:11 -0800
committerleyla_linden <none@none>2011-02-16 15:24:11 -0800
commitf41f7cb607b57a2ba78412e75e754d96a60a06fc (patch)
tree244142ae86831836f438f3d5810104aa03860ccb /indra/newview/llpanelobject.cpp
parent79e8ef7f5133225cc77a751a0909c446a4e14605 (diff)
SH-512 [REGRESSION] Linden trees scale up to 200m on Mesh regions
SH-943 10 meters maximum Prim/Mesh size in latest Mesh Viewers
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
-rw-r--r--indra/newview/llpanelobject.cpp3
1 files changed, 2 insertions, 1 deletions
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);