diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:16:43 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:16:43 -0500 |
| commit | 293b35f000ca4e8a4bcf85dc4782b2a72d1887ea (patch) | |
| tree | 70c1731808e5449a56b8a38007c6c952bb559f48 /indra/newview/llpanelobject.cpp | |
| parent | d0cba9e9194841e8867afcbd02b3792b652756ab (diff) | |
| parent | ee39db49a38a626e72e1924e4c157b16d90e8ee6 (diff) | |
Automated merge from mesh-development
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..8fa6beb474 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 = 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"); |