summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-05-11 00:21:40 -0500
committerDave Parks <davep@lindenlab.com>2010-05-11 00:21:40 -0500
commit8d6fb2dbc6ad9566903f6cd2e539d0abb62d8391 (patch)
tree6c158d9f552e7e14b91ae7ede343b1a93650076d /indra/newview/skins
parente8067c6f8b6cb733c20aa0a002546298bfc88afa (diff)
Hide mesh UI when MeshEnabled is set to false.
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml3
-rw-r--r--indra/newview/skins/default/xui/en/menu_inventory_add.xml2
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index ce6fc48a3b..f5054cf206 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2029,9 +2029,6 @@ even though the user gets a free copy.
label="Cylinder"
name="Cylinder"
value="Cylinder" />
- <combo_box.item
- label="Mesh"
- value="Mesh" />
</combo_box>
</panel>
<panel
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 4e178eef96..936ef4e539 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -51,6 +51,8 @@
parameter="" />
<menu_item_call.on_enable
function="File.EnableUploadModel" />
+ <menu_item_call.on_visible
+ function="File.MeshEnabled"/>
</menu_item_call>
<menu_item_call
label="Bulk (L$[COST] per file)..."