Merge branch 'revert-ctrl-d' into next-1.1

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 00a1fc4..155ec86 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -94,6 +94,13 @@
         Added ConfirmTeleportHome alert text.
 
 
+2009-05-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
+        Reverted Ctrl-D shortcut back to Edit > Duplicate.
+        No longer World > Create Landmark Here.
+
+
 2009-04-20  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/llaudio/audioengine_openal.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 4758116..086f059 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
@@ -127,7 +127,7 @@
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Duplicate" enabled="false"
-                    label="Duplicate">
+                    label="Duplicate" shortcut="control|D">
       <on_click function="Edit.Duplicate" userdata="" />
       <on_enable function="Edit.EnableDuplicate" />
     </menu_item_call>
@@ -487,8 +487,7 @@
       <on_check control="FlyBtnState" />
     </menu_item_check>
     <menu_item_separator />
-    <menu_item_call name="Create Landmark Here" shortcut="control|D"
-                    label="Create Landmark Here">
+    <menu_item_call name="Create Landmark Here" label="Create Landmark Here">
       <on_click function="World.CreateLandmark" userdata="" />
       <on_enable function="World.EnableCreateLandmark" userdata="" />
     </menu_item_call>