3 files changed, 13 insertions, 9 deletions
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index ab39d08830..95c43805d4 100755
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -84,14 +84,8 @@ BOOL LLFloaterMap::postBuild()
     mMap->setParcelSaleAreaMsg(getString("ParcelSaleAreaMsg"));
     mMap->setParcelOwnerMsg(getString("ParcelOwnerMsg"));
     mMap->setRegionNameMsg(getString("RegionNameMsg"));
-    if (gSavedSettings.getBOOL("DoubleClickTeleport"))
-    {
-        mMap->setToolTipHintMsg(getString("AltToolTipHintMsg"));
-    }
-    else if (gSavedSettings.getBOOL("DoubleClickShowWorldMap"))
-    {
-        mMap->setToolTipHintMsg(getString("ToolTipHintMsg"));
-    }
+    mMap->setToolTipHintMsg(getString("ToolTipHintMsg"));
+    mMap->setAltToolTipHintMsg(getString("AltToolTipHintMsg"));
     sendChildToBack(mMap);
 
     mTextBoxNorth     = getChild<LLTextBox>("floater_map_north");
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index e87ec10e5d..29623ccd53 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -699,7 +699,15 @@ BOOL LLNetMap::handleToolTip(S32 x, S32 y, MASK mask)
         }
     }
 
-    std::string tool_tip_hint_msg = mToolTipHintMsg;
+    std::string tool_tip_hint_msg;
+    if (gSavedSettings.getBOOL("DoubleClickTeleport"))
+    {
+        tool_tip_hint_msg = mAltToolTipHintMsg;
+    }
+    else if (gSavedSettings.getBOOL("DoubleClickShowWorldMap"))
+    {
+        tool_tip_hint_msg = mToolTipHintMsg;
+    }
 
     LLStringUtil::format_map_t args;
     args["[PARCEL_NAME_MSG]"]       = parcel_name_msg.empty() ? "" : parcel_name_msg + '\n';
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h
index e7eeda7dcc..b82b3d4105 100644
--- a/indra/newview/llnetmap.h
+++ b/indra/newview/llnetmap.h
@@ -88,6 +88,7 @@ public:
     void            setParcelOwnerMsg(const std::string& msg) { mParcelOwnerMsg = msg; }
     void            setRegionNameMsg(const std::string& msg) { mRegionNameMsg = msg; }
     void            setToolTipHintMsg(const std::string& msg) { mToolTipHintMsg = msg; }
+    void            setAltToolTipHintMsg(const std::string& msg) { mAltToolTipHintMsg = msg; }
 
 	void			renderScaledPointGlobal( const LLVector3d& pos, const LLColor4U &color, F32 radius );
 
@@ -140,6 +141,7 @@ private:
     std::string     mParcelOwnerMsg;
     std::string     mRegionNameMsg;
     std::string     mToolTipHintMsg;
+    std::string     mAltToolTipHintMsg;
 
 public:
 	void			setSelected(uuid_vec_t uuids) { gmSelected=uuids; };