Forgot tooltip for map opening, fixed typo

3 files changed, 19 insertions, 10 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f529acd..387d390 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -14,12 +14,18 @@
                 modified:   linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
                 
                 
-                * Removed double click tp checkbox from preferences as it keeps the two maps more in sync,
-                  and Show Map is in the minimap now. Keeping the debug setting.
+        * Removed double click tp checkbox from preferences as it keeps the two maps more in sync,
+          and Show Map is in the minimap now. Keeping the debug setting.
                 
                 modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
 
 
+        * Forgot tooltip for map opening, fixed typo.
+
+                modified:   linden/indra/newview/llnetmap.cpp
+                modified:   linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
+                
+
 2009-06-12  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Applied patch by Robin Cornelius for VWR-12686:
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index c107256..999a2fe 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -538,11 +538,11 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
                 msg.append( region->getName() );
                 
                 msg.append("\n");
-                msg.append(getString("tooltip_1"));
+                gSavedSettings.getBOOL( "MiniMapTeleport" ) ?
+                                                msg.append(getString("tooltip_tp")) : msg.append(getString("tooltip_map"));
                 msg.append("\n");
-                msg.append(getString("tooltip_2"));
-
-
+                msg.append(getString("tooltip_pan"));
+                
 #ifndef LL_RELEASE_FOR_DOWNLOAD
                 std::string buffer;
                 msg.append("\n");
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 dbd93f5..1a93341 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,10 +50,13 @@
                  text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="21">
                 NW
         </text>
-  <string name="tooltip_1">
-    Double-Cick to Teleport
+  <string name="tooltip_tp">
+    Double-Click teleports
   </string>
-  <string name="tooltip_2">
-    Shift-Drag to Pan
+  <string name="tooltip_pan">
+    Shift-Drag pans
+  </string>
+  <string name="tooltip_map">
+    Double-Click opens Map
   </string>
 </panel>