diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-11 11:38:27 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-11 11:38:27 -0500 |
| commit | 924be3f25c2fca57a8d6f5f902eaeca5c2dd91e1 (patch) | |
| tree | 3ba82720ba6b24830637999bfa605e786d814ced /indra/newview/llfloatermap.cpp | |
| parent | 40abc0fe1e6edd2f018fcdc35ffccdb5475a5fe0 (diff) | |
| parent | 547b40bfc8b0139789a2d9c5dcd1591343a2c60b (diff) | |
pull back release tag from viewer-beta
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"); |