diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
| commit | 85ccab2d8178c508e585f987bb076951bf2e9ddb (patch) | |
| tree | 5fbdf54372657c2c9353d274cd81f62b1e4fdf02 /indra/newview/llfloatermap.cpp | |
| parent | 9f2a04f217d54344360edc554456d9804e17eeb7 (diff) | |
| parent | 6ef593580239df7b967cca59d4cfa9fcd8db6aec (diff) | |
Automated merge with file:///Users/oz/Work/viewer-vs2010
Diffstat (limited to 'indra/newview/llfloatermap.cpp')
| -rw-r--r-- | indra/newview/llfloatermap.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp index 80920c80d6..45d1cc2b53 100644 --- a/indra/newview/llfloatermap.cpp +++ b/indra/newview/llfloatermap.cpp @@ -83,8 +83,14 @@ LLFloaterMap::~LLFloaterMap() BOOL LLFloaterMap::postBuild() { mMap = getChild<LLNetMap>("Net Map"); - mMap->setToolTipMsg(gSavedSettings.getBOOL("DoubleClickTeleport") ? - getString("AltToolTipMsg") : getString("ToolTipMsg")); + if (gSavedSettings.getBOOL("DoubleClickTeleport")) + { + mMap->setToolTipMsg(getString("AltToolTipMsg")); + } + else if (gSavedSettings.getBOOL("DoubleClickShowWorldMap")) + { + mMap->setToolTipMsg(getString("ToolTipMsg")); + } sendChildToBack(mMap); mTextBoxNorth = getChild<LLTextBox> ("floater_map_north"); @@ -150,7 +156,7 @@ BOOL LLFloaterMap::handleDoubleClick(S32 x, S32 y, MASK mask) // If DoubleClickTeleport is on, double clicking the minimap will teleport there gAgent.teleportViaLocationLookAt(pos_global); } - else + else if (gSavedSettings.getBOOL("DoubleClickShowWorldMap")) { LLFloaterReg::showInstance("world_map"); } |