summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/menu_viewer.xml
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-03 16:28:58 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-03 16:28:58 +0300
commite2135bd6dd7668560f5b3af5e1a7549488caa2ab (patch)
treea033e2809d98ebea2fa74a5808c235276f5f5df2 /indra/newview/skins/default/xui/en/menu_viewer.xml
parentb12201bf01caeef0f5a13951980be187ac3936c8 (diff)
parentd10b9a7f37bec670342136eeea2c8c2604fdfeef (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml16
1 files changed, 7 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3557318705..63ff7047b4 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -707,13 +707,6 @@
label="Options"
name="Options"
tear_off="true">
- <menu_item_call
- label="Set Default Upload Permissions"
- name="perm prefs">
- <menu_item_call.on_click
- function="Floater.Toggle"
- parameter="perm_prefs" />
- </menu_item_call>
<menu_item_check
label="Show Advanced Permissions"
name="DebugPermissions">
@@ -873,8 +866,13 @@
function="File.UploadBulk"
parameter="" />
</menu_item_call>
- <menu_item_separator
- layout="topleft" />
+ <menu_item_call
+ label="Set Default Upload Permissions"
+ name="perm prefs">
+ <menu_item_call.on_click
+ function="Floater.Toggle"
+ parameter="perm_prefs" />
+ </menu_item_call>
</menu>
</menu>
<menu