diff options
| -rw-r--r-- | doc/contributions.txt | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_object.xml | 20 |
2 files changed, 14 insertions, 13 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 9266ae3c5b..9ad0f80f21 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -366,15 +366,16 @@ JB Kraft Joghert LeSabre VWR-64 Jonathan Yap - STORM-596 STORM-523 + STORM-596 + STORM-615 STORM-616 STORM-679 - STORM-737 STORM-726 + STORM-737 + STORM-785 STORM-812 VWR-17801 - STORM-785 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index c751aa4e0c..719509301b 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -100,7 +100,7 @@ name="Object Attach HUD" /> </context_menu> <context_menu - label="Remove" + label="Manage" name="Remove"> <menu_item_call enabled="false" @@ -129,15 +129,6 @@ <menu_item_call.on_enable function="Object.EnableReturn" /> </menu_item_call> - <menu_item_call - enabled="false" - label="Delete" - name="Delete"> - <menu_item_call.on_click - function="Object.Delete" /> - <menu_item_call.on_enable - function="Object.EnableDelete" /> - </menu_item_call> </context_menu> <menu_item_separator layout="topleft" /> <menu_item_call @@ -176,4 +167,13 @@ <menu_item_call.on_enable function="Object.EnableBuy" /> </menu_item_call> + <menu_item_call + enabled="false" + label="Delete" + name="Delete"> + <menu_item_call.on_click + function="Object.Delete" /> + <menu_item_call.on_enable + function="Object.EnableDelete" /> + </menu_item_call> </context_menu> |