Added shortcut and message to landmark creation

4 files changed, 23 insertions, 4 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index e8f0c75..4ab37bd 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -100,6 +100,14 @@
         * linden/indra/llwindow/llwindowsdl.cpp:
         Ditto.
 
+        * linden/indra/newview/llviewermenu.cpp:
+        Added shortcut and message to landmark creation.
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/strings.xml:
+        Ditto.
+
+
 
 2008-12-30  McCabe Maxsted  <hakushakukun@gmail.com>
 
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 3bf390e..049f0d1 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -146,13 +146,14 @@
 #include "llinventorymodel.h"
 #include "llinventoryview.h"
 #include "llkeyboard.h"
-#include "llpanellogin.h"
+#include "lllineeditor.h"
 #include "llmenucommands.h"
 #include "llmenugl.h"
 #include "llmorphview.h"
 #include "llmoveview.h"
 #include "llmutelist.h"
 #include "llnotify.h"
+#include "llpanellogin.h"
 #include "llpanelobject.h"
 #include "llparcel.h"
 #include "llprimitive.h"
@@ -174,6 +175,7 @@
 #include "lltoolpie.h"
 #include "lltoolplacer.h"
 #include "lltoolselectland.h"
+#include "lltrans.h"
 #include "lluictrlfactory.h"
 #include "lluploaddialog.h"
 #include "lluserauth.h"
@@ -4874,10 +4876,17 @@ class LLWorldCreateLandmark : public view_listener_t
                         return true;
                 }
 
+                LLChat chat;
+
                 LLUUID folder_id;
                 folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
                 std::string pos_string;
                 gAgent.buildLocationString(pos_string);
+
+                std::string log_message = LLTrans::getString("landmark_created") + " ";
+                log_message += pos_string;
+                chat.mText = log_message;
+                LLFloaterChat::addChat(chat, FALSE, FALSE);
                 
                 create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
                                                           folder_id, LLTransactionID::tnull,
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 682acb9..303a9c1 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,8 +127,7 @@
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Duplicate" enabled="false"
-                    label="Duplicate"
-                    shortcut="control|D">
+                    label="Duplicate">
       <on_click function="Edit.Duplicate" userdata="" />
       <on_enable function="Edit.EnableDuplicate" />
     </menu_item_call>
@@ -489,7 +488,7 @@
       <on_check control="FlyBtnState" />
     </menu_item_check>
     <menu_item_separator />
-    <menu_item_call name="Create Landmark Here"
+    <menu_item_call name="Create Landmark Here" shortcut="control|D"
                     label="Create Landmark Here">
       <on_click function="World.CreateLandmark" userdata="" />
       <on_enable function="World.EnableCreateLandmark" userdata="" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index dd73f20..ecacc78 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -176,5 +176,8 @@
         <string name="whisper">whispers:</string>
         <string name="shout">shouts:</string>
 
+  <!-- System messages -->
+  <string name="landmark_created">You created a landmark at</string>
+
 </strings>