diff options
| author | leyla_linden <none@none> | 2011-02-01 15:42:52 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-02-01 15:42:52 -0800 |
| commit | 990a6206604b0a5e33902145b496f39927f6d5b9 (patch) | |
| tree | c0d7561dc56b9003387554a640505af8fcc7cc51 /indra/newview/llfloatermap.cpp | |
| parent | 1b366dfe72c5852904468aaf8ff66e8e7be88318 (diff) | |
| parent | 7c5c82cb116b2dfd163055994803e07a1bfd5a8b (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"); |