Skip to content
Snippets Groups Projects
Commit 014eb72f authored by Tofu Linden's avatar Tofu Linden
Browse files

merge storm-173

parents 2f29c351 214cdc41
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 2
− 0
View file @ 014eb72f
...@@ -388,6 +388,7 @@ Matthew Dowd ...@@ -388,6 +388,7 @@ Matthew Dowd
VWR-1761 VWR-1761
VWR-2681 VWR-2681
McCabe Maxsted McCabe Maxsted
SNOW-387
VWR-1318 VWR-1318
VWR-4065 VWR-4065
VWR-4826 VWR-4826
...@@ -660,6 +661,7 @@ Techwolf Lupindo ...@@ -660,6 +661,7 @@ Techwolf Lupindo
SNOW-687 SNOW-687
SNOW-680 SNOW-680
SNOW-681 SNOW-681
SNOW-685
SNOW-690 SNOW-690
VWR-12385 VWR-12385
tenebrous pau tenebrous pau
......
indra/newview/skins/default/xui/en/menu_viewer.xml
+ 8
− 0
View file @ 014eb72f
...@@ -669,6 +669,14 @@ ...@@ -669,6 +669,14 @@
function="Tools.SaveToObjectInventory" /> function="Tools.SaveToObjectInventory" />
<menu_item_call.on_enable <menu_item_call.on_enable
function="Tools.EnableSaveToObjectInventory" /> function="Tools.EnableSaveToObjectInventory" />
</menu_item_call>
<menu_item_call
label="Return Object"
name="Return Object back to Owner">
<menu_item_call.on_click
function="Object.Return" />
<menu_item_call.on_enable
function="Object.EnableReturn" />
</menu_item_call> </menu_item_call>
</menu> </menu>
<menu <menu
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment