From d950a97af099b4560753957ccf8f2d69102f20c6 Mon Sep 17 00:00:00 2001 From: Andrew Productengine Date: Wed, 6 Oct 2010 14:02:34 +0300 Subject: STORM-299 FIXED World map floater opening instead Mini-map if double-click on minimized Mini-map. - What map floater is shown on Mini-map doublecklick now differs depending on whether it is minimized. --- indra/newview/llfloatermap.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp index c9d7eff02b..6571401632 100644 --- a/indra/newview/llfloatermap.cpp +++ b/indra/newview/llfloatermap.cpp @@ -125,7 +125,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; } -- cgit v1.2.3