summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobject.cpp
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-02-01 15:42:52 -0800
committerleyla_linden <none@none>2011-02-01 15:42:52 -0800
commit990a6206604b0a5e33902145b496f39927f6d5b9 (patch)
treec0d7561dc56b9003387554a640505af8fcc7cc51 /indra/newview/llpanelobject.cpp
parent1b366dfe72c5852904468aaf8ff66e8e7be88318 (diff)
parent7c5c82cb116b2dfd163055994803e07a1bfd5a8b (diff)
Merge
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
-rw-r--r--indra/newview/llpanelobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index b60eb893c7..8fa6beb474 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -1934,7 +1934,7 @@ void LLPanelObject::refresh()
getChildView("Physics Density")->setVisible(enable_mesh);
getChildView("Physics Restitution")->setVisible(enable_mesh);
- F32 max_scale = get_default_max_prim_scale();
+ 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);