From 0fe0425cfb78c62f052d5af864b75a98dca34748 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 11 Jun 2009 01:35:08 -0700
Subject: Moved 'Duplicate' to the Tools menu

---
 ChangeLog.txt                                              | 14 +++++++++++---
 .../indra/newview/skins/default/xui/en-us/menu_viewer.xml  | 12 ++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index d9f904a..398732a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+2009-06-11  McCabe Maxsted  <hakushakukun@gmail.com>
+
+	* Moved 'Duplicate' to the Tools menu.
+	
+		modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+	
+	
+
 2009-06-10  McCabe Maxsted  <hakushakukun@gmail.com>
 
 	* Fixed Communicate window not toggling from menu.
@@ -29,9 +37,9 @@
 	* Applied Armin's patch to create an Advanced Menu menu item.
 	  (Placed it in View and changed it to a check.)
 	
-		modified:   indra/newview/llviewermenu.cpp
-		modified:   indra/newview/llviewerwindow.cpp
-		modified:   indra/newview/skins/default/xui/en-us/menu_viewer.xml
+		modified:   linden/indra/newview/llviewermenu.cpp
+		modified:   linden/indra/newview/llviewerwindow.cpp
+		modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
 
 
 2009-06-09  McCabe Maxsted  <hakushakukun@gmail.com>
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 d0f0bac..4ba9ae4 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
@@ -126,12 +126,6 @@
       <on_enable function="Edit.EnableDeselect" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Duplicate" enabled="false"
-                    label="Duplicate" shortcut="control|D">
-      <on_click function="Edit.Duplicate" userdata="" />
-      <on_enable function="Edit.EnableDuplicate" />
-    </menu_item_call>
-    <menu_item_separator />
 
     <menu name="Attach Object" create_jump_keys="true"
           label="Attach Object" opaque="true" tear_off="true" />
@@ -635,6 +629,11 @@
       <on_click function="Tools.LookAtSelection" userdata="zoom" />
       <on_enable function="Tools.SomethingSelectedNoHUD" />
     </menu_item_call>
+    <menu_item_call name="Duplicate" enabled="false"
+                    label="Duplicate" shortcut="control|D">
+      <on_click function="Edit.Duplicate" userdata="" />
+      <on_enable function="Edit.EnableDuplicate" />
+    </menu_item_call>
     <menu_item_call name="Menu Object Take" enabled="false"
                     label="Take" visible="false">
       <on_click function="Tools.Take" userdata="" />
@@ -645,6 +644,7 @@
       <on_click function="Tools.TakeCopy" userdata="" />
       <on_enable function="Tools.EnableTakeCopy" />
     </menu_item_call>
+    <menu_item_separator />
     <menu_item_call name="Return..." enabled="false"
                     label="Return Object">
       <on_click function="Object.Return" />
-- 
cgit v1.1