diff options
| author | Tofu Buzzard <no-email> | 2011-02-01 09:45:28 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-01 09:45:28 -0800 |
| commit | ce90d8f8da4f0d2ca6b3aa3a96c0ce68a64bd495 (patch) | |
| tree | d4d31830e96d75a8062074c3ce98b5884a0b47ba /indra/newview/llfloatermap.cpp | |
| parent | 3f139aa20ab0ebd983837c2d041ca53a0e7c5fb8 (diff) | |
| parent | 7ddf7e17c01242901cef9219e27077e0d1243997 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatermap.cpp')
| -rw-r--r-- | indra/newview/llfloatermap.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp index 1b94d8cbcd..80920c80d6 100644 --- a/indra/newview/llfloatermap.cpp +++ b/indra/newview/llfloatermap.cpp @@ -83,7 +83,8 @@ LLFloaterMap::~LLFloaterMap() BOOL LLFloaterMap::postBuild() { mMap = getChild<LLNetMap>("Net Map"); - mMap->setToolTipMsg(getString("ToolTipMsg")); + mMap->setToolTipMsg(gSavedSettings.getBOOL("DoubleClickTeleport") ? + getString("AltToolTipMsg") : getString("ToolTipMsg")); sendChildToBack(mMap); mTextBoxNorth = getChild<LLTextBox> ("floater_map_north"); |