diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-02 01:36:28 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-02 01:36:28 -0500 |
| commit | faef58a9b91ecbbffd93fa90347f1b8bd5856902 (patch) | |
| tree | 9061be49e7f57e3fd994fd3b5da006d06ca6c326 | |
| parent | c8ea9476ada163c62319d7949a5fd57aaa7fb09f (diff) | |
SH-1666 Remove "Mesh" stitching type from sculpt combo box.
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 14 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 6 |
2 files changed, 1 insertions, 19 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 34a92cd0ac..52917ff20b 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1740,25 +1740,11 @@ void LLPanelObject::refresh() mRootObject = NULL; } - bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled") && - gAgent.getRegion() && - !gAgent.getRegion()->getCapability("GetMesh").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"); - } } diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 40bf7bfed7..f5f6b990d1 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2098,11 +2098,7 @@ even though the user gets a free copy. label="Cylinder" name="Cylinder" value="Cylinder" /> - <combo_box.item - label="Mesh" - name="Mesh" - value="Mesh" /> - </combo_box> + </combo_box> </panel> <panel border="false" |