diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
| commit | ba1123e3e482fdd061095c1374a41f8d007fbc22 (patch) | |
| tree | 499b01923892a406d306eadd4507e6d7a41b471b /indra/newview/skins/default/xui/en/menu_inventory_add.xml | |
| parent | 623dae525dc14a69322266e33421770431c34a66 (diff) | |
| parent | c3099df719274556fede1a57bc42e555e5c89fbb (diff) | |
Manual merge from default branch
Resolved conflicts in llpaneloutfitedit.cpp
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_inventory_add.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory_add.xml | 9 |
1 files changed, 7 insertions, 2 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 5ad099e2d9..ae98abf4fb 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 |