Skip to content
Snippets Groups Projects
Commit 2eebb6d9 authored by Mike Antipov's avatar Mike Antipov
Browse files

Merge with another head in branch 

--HG--
branch : product-engine
parents ca9d38eb 88f055eb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/skins/default/xui/en/menu_inventory_add.xml
+ 7
− 2
View file @ 2eebb6d9
...@@ -50,8 +50,13 @@ ...@@ -50,8 +50,13 @@
function="File.UploadBulk" function="File.UploadBulk"
parameter="" /> parameter="" />
</menu_item_call> </menu_item_call>
<menu_item_separator <menu_item_call
layout="topleft" /> 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_item_call <menu_item_call
......
indra/newview/skins/default/xui/en/menu_viewer.xml
+ 7
− 9
View file @ 2eebb6d9
...@@ -707,13 +707,6 @@ ...@@ -707,13 +707,6 @@
label="Options" label="Options"
name="Options" name="Options"
tear_off="true"> 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 <menu_item_check
label="Show Advanced Permissions" label="Show Advanced Permissions"
name="DebugPermissions"> name="DebugPermissions">
...@@ -873,8 +866,13 @@ ...@@ -873,8 +866,13 @@
function="File.UploadBulk" function="File.UploadBulk"
parameter="" /> parameter="" />
</menu_item_call> </menu_item_call>
<menu_item_separator <menu_item_call
layout="topleft" /> 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> </menu>
<menu <menu
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment