diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-13 17:08:00 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-13 17:08:00 -0400 |
| commit | ded6a78541d9f779b5cbef0d1255588b93d5dce6 (patch) | |
| tree | f343cacbfd01888c604b891ceb877b429f50641c /indra/newview/llfloatermap.cpp | |
| parent | fa20a3fe100bd2c99b6fe4c087c79268752a107c (diff) | |
| parent | c7c43d83f80dcac8be79cc76c9d9bbf8ff4c8354 (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llfloatermap.cpp')
| -rw-r--r-- | indra/newview/llfloatermap.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp index 4a324773e9..a1d291fea6 100644 --- a/indra/newview/llfloatermap.cpp +++ b/indra/newview/llfloatermap.cpp @@ -124,7 +124,9 @@ BOOL LLFloaterMap::postBuild() BOOL LLFloaterMap::handleDoubleClick( S32 x, S32 y, MASK mask ) { - LLFloaterReg::showInstance("world_map"); + // If floater is minimized, minimap should be shown on doubleclick (STORM-299) + std::string floater_to_show = this->isMinimized() ? "mini_map" : "world_map"; + LLFloaterReg::showInstance(floater_to_show); return TRUE; } |