diff options
| author | Tofu Buzzard <no-email> | 2011-02-17 12:14:32 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-17 12:14:32 -0800 |
| commit | 3362fc17f93cbd7e6bfa23dc7af64ef749609ee2 (patch) | |
| tree | 4fd4be7a8e52b0e746468fd8822db8dab9c4861d /indra/newview/llpanelobject.cpp | |
| parent | 8921bdf0577c1282d5aa9cd920f0b57b77d95682 (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); |