From 79130c5744694b79ad4ad1aaff591f387aedf282 Mon Sep 17 00:00:00 2001
From: Cinders <cinder@cinderblocks.biz>
Date: Thu, 7 Feb 2013 14:36:18 -0700
Subject: [PATCH] =?UTF-8?q?Trying=20this=20again=20without=20my=20local=20?=
 =?UTF-8?q?changes=E2=80=A6=20FIRE-6657:=20Add=20a=20Create=20Landmark=20b?=
 =?UTF-8?q?utton=20to=20the=20Toybox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 indra/newview/app_settings/commands.xml          |   8 ++++++++
 .../newview/skins/default/textures/textures.xml  |   1 +
 .../textures/toolbar_icons/landmark_here.png     | Bin 0 -> 4103 bytes
 indra/newview/skins/default/xui/en/strings.xml   |   2 ++
 4 files changed, 11 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/landmark_here.png

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 2fe09904e9..29b38f7537 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -429,4 +429,12 @@
            execute_function="View.Mouselook"
            is_enabled_function="View.EnableMouselook"
            />
+  <command name="landmark_here"
+           available_in_toybox="true"
+           icon="landmark_here"
+           label_ref="Command_Landmark_Here_Label"
+           tooltip_ref="Command_Landmark_Here_Tooltip"
+           execute_function="World.CreateLandmark"
+           is_enabled_function="World.EnableCreateLandmark"
+           />
 </commands>
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index e62893beca..92f4cb1c0b 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -715,6 +715,7 @@ with the same filename but different name
   <texture name="phototools_camera" file_name="toolbar_icons/phototools_cam.png" preload="true" />
   <texture name="contact_sets" file_name="toolbar_icons/contact_sets.png" preload="true" />
   <texture name="mouselook" file_name="toolbar_icons/mouselook.png" preload="true" />
+  <texture name="landmark_here" file_name="toolbar_icons/landmark_here.png" preload="true" />
 
   
   <texture name="Unread_Chiclet" file_name="bottomtray/Unread_Chiclet.png" preload="false" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/landmark_here.png b/indra/newview/skins/default/textures/toolbar_icons/landmark_here.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d4d047975ed808432768fbf1e958fced69adc76
GIT binary patch
literal 4103
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
LWu#fDVH5ISzF^I7

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b81299b89b..70c535be3f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4842,6 +4842,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Phototools_View_Label">Phototools camera</string>
   <string name="Command_Contact_Sets_Label">Contact sets</string>
   <string name="Command_Mouselook_Label">Mouselook</string>
+  <string name="Command_Landmark_Here_Label">Create Landmark</string>
   
 
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
@@ -4885,6 +4886,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Phototools_View_Tooltip">Advanced phototools camera controls</string>
   <string name="Command_Contact_Sets_Tooltip">Opens contact sets (CTRL+ALT+SHIFT+C)</string>
   <string name="Command_Mouselook_Tooltip">Enter mouselook mode (M)</string>
+  <string name="Command_Landmark_Here_Tooltip">Creates a landmark of your current position</string>
 
   <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string>
   <string name="Toolbar_Left_Tooltip"  >currently in your left toolbar</string>