diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
| commit | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (patch) | |
| tree | 55de3117a3937e6258f586fd7a5a5ad294819920 /indra/newview/llfloatermap.cpp | |
| parent | 10cf492ef1730e869389b704345a6604ed363427 (diff) | |
| parent | eacd9d5d590069b56ae3497a3830c5e299475a4a (diff) | |
merge changes for storm-937
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"); |