diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-01-31 18:04:01 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-01-31 18:04:01 -0500 |
| commit | b2b4370e34bf752eea60ff954ff85375f07d27d0 (patch) | |
| tree | b1f26719897fc706ee0a2706cd62193ca8658bdd /indra/newview/llpanelobject.cpp | |
| parent | 7205ad6d53224d5ade142c579d1c38b49f3d9885 (diff) | |
| parent | 09bfb95976b28b9d1f8d3cc0959381fcba389a4e (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 3e2d903d58..8fa6beb474 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1934,10 +1934,10 @@ void LLPanelObject::refresh() getChildView("Physics Density")->setVisible(enable_mesh); getChildView("Physics Restitution")->setVisible(enable_mesh); - // if mesh isn't enabled we want to the scale max to be 10 - getChild<LLSpinCtrl>("Scale X")->setMaxValue(enable_mesh ? 64 : 10); - getChild<LLSpinCtrl>("Scale Y")->setMaxValue(enable_mesh ? 64 : 10); - getChild<LLSpinCtrl>("Scale Z")->setMaxValue(enable_mesh ? 64 : 10); + F32 max_scale = DEFAULT_MAX_PRIM_SCALE_NO_MESH; + getChild<LLSpinCtrl>("Scale X")->setMaxValue(max_scale); + getChild<LLSpinCtrl>("Scale Y")->setMaxValue(max_scale); + getChild<LLSpinCtrl>("Scale Z")->setMaxValue(max_scale); LLComboBox* sculpt_combo = getChild<LLComboBox>("sculpt type control"); BOOL found = sculpt_combo->itemExists("Mesh"); |