summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobject.cpp
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-01-28 16:39:02 -0800
committerleyla_linden <none@none>2011-01-28 16:39:02 -0800
commitfefc37e92fc5313e88fc7416e78fc2436abfffdb (patch)
tree69f1a115bf8d06be6b4f54c35176a5eb314948cb /indra/newview/llpanelobject.cpp
parentad54a46ba2bc3886f9663bcaa4a6757fac733af7 (diff)
SH-808 making sure the 10m vs. 64m scale limit switch happens for both the spinner and the manipulation tools etc.
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
-rw-r--r--indra/newview/llpanelobject.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 3e2d903d58..b60eb893c7 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 = get_default_max_prim_scale();
+ 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");