summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-20 20:19:58 -0400
committerOz Linden <oz@lindenlab.com>2011-04-20 20:19:58 -0400
commit3f9a2dc4d252be578aa98b3c25ecf75e7621f9db (patch)
tree5c03ad05e21e4940be2146af681dd2199a170c17 /indra/newview
parentf836f67092362e92eb16dd3f20b9616557c26058 (diff)
parentd75e8db4d05462c5624bd1295befaf7339478f5a (diff)
merge changes for storm-1184
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 51610c0ae0..a5115b0faa 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3113,6 +3113,16 @@
function="ToggleControl"
parameter="ImagePipelineUseHTTP" />
</menu_item_check>
+ <menu_item_check
+ label="HTTP Inventory"
+ name="HTTP Inventory">
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="UseHTTPInventory" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="UseHTTPInventory" />
+ </menu_item_check>
<menu_item_call
label="Compress Images"
name="Compress Images">