livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge storm-173

master
Tofu Linden 2010-09-27 16:54:14 +01:00
parent 2f29c35114 214cdc4177
commit 014eb72f1f
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -388,6 +388,7 @@ Matthew Dowd
VWR-1761
VWR-2681
McCabe Maxsted
SNOW-387
VWR-1318
VWR-4065
VWR-4826
@ -660,6 +661,7 @@ Techwolf Lupindo
SNOW-687
SNOW-680
SNOW-681
SNOW-685
SNOW-690
VWR-12385
tenebrous pau

8
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -669,6 +669,14 @@
function="Tools.SaveToObjectInventory" />
<menu_item_call.on_enable
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>
<menu