livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-1666 Remove "Mesh" stitching type from sculpt combo box.

master
Dave Parks 2011-06-02 01:36:28 -05:00
parent c8ea9476ad
commit faef58a9b9
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llpanelobject.cpp
View File

@ -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");
}
}

6
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -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"