From 88f055ebf6ccff7826368da2aad0d1d14a0c581a Mon Sep 17 00:00:00 2001 From: Andrew Polunin <apolunin@productengine.com> Date: Mon, 12 Jul 2010 18:54:11 +0300 Subject: [PATCH] EXT-7884 (\"Set Default Upload Permissions\" may make more sense in the Upload sub-menu) - In viewer menu 'Set Default Upload Permissions' menu item was moved from 'Options' menu to the 'Upload' menu. - 'Set Default Upload Permissions' menu item was added to the inventory menu. - Removed stray separators. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/734/ --HG-- branch : product-engine --- .../skins/default/xui/en/menu_inventory_add.xml | 9 +++++++-- .../newview/skins/default/xui/en/menu_viewer.xml | 16 +++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) 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 5ad099e2d9e..ae98abf4fbc 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -50,8 +50,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_item_call diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 35573187055..63ff7047b48 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 -- GitLab