diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:34:17 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:34:17 -0500 |
| commit | ed308d15bf2f88f91687411cd92f6cc55b1e75b4 (patch) | |
| tree | 9353a91515097c1088ed850ab27372e433f2f7c1 /indra/newview/llfloatermap.cpp | |
| parent | 5322021746582195df6b7ad5843a7da09e617917 (diff) | |
| parent | cb6d59513eabe72029821a96191873351fd5c753 (diff) | |
merge changes for storm-845
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"); |