diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-07 15:58:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-07 15:58:20 -0700 |
| commit | c8cd7ef7a4da4482b776c37201b158a443dd737a (patch) | |
| tree | 521c6dc7af632dc9df64a69c18997eb091d68f20 /indra/newview/llfloatermap.cpp | |
| parent | d1ad7a56beee603b336600d4aace1e4d4c0f5ade (diff) | |
| parent | d25a30e55b7e6a20173c3a53891489adc5610d72 (diff) | |
Pull update 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; } |