diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-02-17 14:08:52 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-02-17 14:08:52 -0500 |
| commit | ad2c986098954096161406fccccfb7eec3729a81 (patch) | |
| tree | e9539a69316927de6545cb60cb727959f5e76b12 /indra/newview/llpanelobject.cpp | |
| parent | 2d0f754b45a21f8e734fefb3f4b88ac65133d576 (diff) | |
| parent | 0ba198b94b85979bc970f2fcabf9df652d94e669 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 3 |
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); |