diff options
| author | Tofu Buzzard <no-email> | 2011-01-30 10:39:02 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-01-30 10:39:02 -0800 |
| commit | 489a01181da4f599eb4d0520636278be3ceac2bc (patch) | |
| tree | 11e55a7c3dcbbf2383ea395b342e4257a7a2524b /indra/newview/llpanelobject.cpp | |
| parent | 139dddda8f416782d69f39b22c2665c4a196877a (diff) | |
| parent | fe253e6ec6f77a7967cadd6efd76b2fbbef4e2da (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index f1fd47f50e..b60eb893c7 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1923,7 +1923,8 @@ void LLPanelObject::refresh() mRootObject = NULL; } - bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled"); + bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled") && + !gAgent.getRegion()->getCapability("GetMesh").empty(); getChildView("label physicsshapetype")->setVisible(enable_mesh); getChildView("Physics Shape Type Combo Ctrl")->setVisible(enable_mesh); @@ -1933,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"); |