diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:22:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:22:45 -0400 |
| commit | 31edad0a226a14b5b87fe364c629f8450bda567c (patch) | |
| tree | e03ed820a759cd5d5c5f4f930762f73b0fe4cf24 /indra/newview/llfloatermap.cpp | |
| parent | b6e6ba224620e0b122062c88f40295c10ce8db2d (diff) | |
| parent | 742dd75751f65224d80eb4f7d20daf5a21776c5f (diff) | |
merge changes for storm-357
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"); } |