summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloatermap.cpp4
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;
}