Moved mini-map tooltips to XML, added panning tooltip

3 files changed, 13 insertions, 9 deletions

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>