Merge branch 'VWR-1363' into menu_viewer

Conflicts:
	linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml

2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7dd2814..7bda6cc 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,8 @@
+2008-09-19  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
+        VWR-1363: Add "Return Object" to the Tools menu.
+
 2008-09-19  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/llviewermenu.cpp: 
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index e5a32ec..737fb56 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -590,6 +590,10 @@
                         <on_click function="Tools.TakeCopy" userdata="" />
                         <on_enable function="Tools.EnableTakeCopy" />
                 </menu_item_call>
+                <menu_item_call name="Return..." enabled="false" label="Return Object">
+                        <on_click function="Object.Return" />
+                        <on_enable function="Object.EnableReturn" />
+                </menu_item_call>
                 <menu_item_call name="Save Object Back to My Inventory" enabled="false"
                      label="Save Object Back to My Inventory">
                         <on_click function="Tools.SaveToInventory" userdata="" />