From dd5f0d1bf55e806d374d2f65e6e288e3f3aacc12 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 13 Jun 2009 03:42:33 -0700
Subject: Moved mini-map tooltips to XML, added panning tooltip

---
 ChangeLog.txt                                               |  7 +++++++
 linden/indra/newview/llnetmap.cpp                           | 13 ++++++-------
 .../newview/skins/default/xui/en-us/floater_mini_map.xml    |  3 +--
 .../newview/skins/default/xui/en-us/panel_mini_map.xml      |  6 ++++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b174987..4c9a14c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -5,6 +5,13 @@
 		modified:   linden/indra/newview/llnetmap.cpp
 		modified:   linden/indra/newview/llnetmap.h
 		modified:   linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+		
+		
+	* Moved mini-map tooltips to XML, added panning tooltip.
+		
+		modified:   linden/indra/newview/llnetmap.cpp
+		modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+		modified:   linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
 
 
 2009-06-12  McCabe Maxsted  <hakushakukun@gmail.com>
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 85b0f28..c107256 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -536,6 +536,12 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
 			msg.append("\n");
 		}
 		msg.append( region->getName() );
+		
+		msg.append("\n");
+		msg.append(getString("tooltip_1"));
+		msg.append("\n");
+		msg.append(getString("tooltip_2"));
+
 
 #ifndef LL_RELEASE_FOR_DOWNLOAD
 		std::string buffer;
@@ -546,13 +552,6 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
 		buffer = region->getHost().getString();
 		msg.append(buffer);
 #endif
-		// *TODO: 
-		//	- put this under the control of XUI so it can be translated.
-
-		if ( gSavedSettings.getBOOL( "MiniMapTeleport" ))
-			msg.append("\n(Double-click to teleport)");
-		else
-			msg.append("\n(Double-click to open Map)");
 
 		S32 SLOP = 4;
 		localPointToScreen( 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 1b31afa..9f1e164 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -3,6 +3,5 @@
 	 can_tear_off="false" follows="top|right" height="220" min_height="64" min_width="64"
 	 name="minimap" rect_control="FloaterMiniMapRect" width="200">
     <panel bottom="2" follows="left|top|right|bottom" height="216" label="Mini Map"
-		 left="2" mouse_opaque="false" name="mini_mapview" 
-		 width="196" />
+		 left="2" mouse_opaque="false" name="mini_mapview" width="196" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
index a74782c..dbd93f5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
@@ -50,4 +50,10 @@
 		 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="21">
 		NW
 	</text>
+  <string name="tooltip_1">
+    Double-Cick to Teleport
+  </string>
+  <string name="tooltip_2">
+    Shift-Drag to Pan
+  </string>
 </panel>
-- 
cgit v1.1