diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-11 08:59:19 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-11 08:59:19 -0400 |
| commit | e2e70577f90d9551f4afe637bfd486654d778e5e (patch) | |
| tree | 831de0c3fa62bc84d7e67f8c5041976efb60d84d /indra/newview/llfloatermap.cpp | |
| parent | ecbc00351aed97cfe2f87267789732ff00c2333b (diff) | |
| parent | bb74487c859acccb8f88002630606419761136e4 (diff) | |
merged fix for STORM-222
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; } |