diff options
| author | Tofu Buzzard <no-email> | 2011-02-17 12:14:46 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-17 12:14:46 -0800 |
| commit | 03c738d0c9df57a786803a292bc766e78d014749 (patch) | |
| tree | 08c8e8529056d12240fa4e71987b54c2ce28d2f4 /indra/newview/llpanelobject.cpp | |
| parent | d8e04b9d31b0c77289f5f770f2a9b54506650151 (diff) | |
| parent | 3362fc17f93cbd7e6bfa23dc7af64ef749609ee2 (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); |