diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-06-21 18:29:50 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-06-21 18:29:50 -0400 |
| commit | d5ea63119d1cc848318dbeeaa42e9ce3b777ee51 (patch) | |
| tree | 4b5403406184c8e7635ccb989a2dfceb46f95693 /indra/newview/llpanelobject.cpp | |
| parent | 20100ba38c6d3fa16ab11be2ed326ab0964c4c21 (diff) | |
| parent | ede3b577d8cebd5065514bb485e2cbd93dd5b05a (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index b4d0ada196..52917ff20b 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1740,26 +1740,11 @@ void LLPanelObject::refresh() mRootObject = NULL; } - bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled") && - gAgent.getRegion() && - !gAgent.getRegion()->getCapability("GetMesh").empty() && - !gAgent.getRegion()->getCapability("ObjectAdd").empty(); - F32 max_scale = get_default_max_prim_scale(LLPickInfo::isFlora(mObject)); getChild<LLSpinCtrl>("Scale X")->setMaxValue(max_scale); getChild<LLSpinCtrl>("Scale Y")->setMaxValue(max_scale); getChild<LLSpinCtrl>("Scale Z")->setMaxValue(max_scale); - - BOOL found = mCtrlSculptType->itemExists("Mesh"); - if (enable_mesh && !found) - { - mCtrlSculptType->add("Mesh"); - } - else if (!enable_mesh && found) - { - mCtrlSculptType->remove("Mesh"); - } } |