summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-28 11:59:20 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-28 11:59:20 -0700
commit4d66b25abfc28352cefcc7665ecb1ee6e68f858b (patch)
tree7cdb01895b219ac567ef8508faa143df054119d6 /indra/newview/skins
parentfafc23e3b4dd44b441e175d07c40cf26ae256967 (diff)
NORSPEC-182 do not add 'Use Texture' menu items in XML to avoid accidental appearance in menu 1st time
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_tools_texture.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index d3a9437063..5ac2ec2b20 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -318,10 +318,13 @@
label="weave"
name="weave"
value="weave" />
+ <!--
+ NORSPEC-182, ensure item doesn't show up in menu until it should
<combo_box.item
label="Use texture"
name="Use texture"
value="Use texture" />
+ -->
</combo_box>
<texture_picker
allow_no_texture="true"
@@ -373,10 +376,13 @@
label="High"
name="High"
value="High" />
+ <!--
+ NORSPEC-182, ensure item doesn't show up in menu until it should
<combo_box.item
label="Use texture"
name="Use texture"
value="Use texture" />
+ -->
</combo_box>
<text
type="string"