diff options
| author | prep linden <prep@lindenlab.com> | 2011-03-16 17:10:06 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-03-16 17:10:06 -0400 |
| commit | 4b54ec7965cd874af4d0eef381d0bc9fe06cff04 (patch) | |
| tree | dd967a4263907ad7de733622cff8f886da1ac7de /indra/newview/llfloatermap.cpp | |
| parent | aaaddfe08942ff15bbe0c6549dc82dda95ce3ba1 (diff) | |
| parent | 037a83cd47e016f70092bccfdb2c13e759c6ff0a (diff) | |
merge
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"); } |