diff options
| author | Andrew Productengine <adyukov@productengine.com> | 2010-10-06 14:02:34 +0300 |
|---|---|---|
| committer | Andrew Productengine <adyukov@productengine.com> | 2010-10-06 14:02:34 +0300 |
| commit | d950a97af099b4560753957ccf8f2d69102f20c6 (patch) | |
| tree | e7628600e76cefd6b110a003878c3e6f080bac4e | |
| parent | 9010dd5d3110fbd5f5de8fad7295111c8c412bf4 (diff) | |
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.
| -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 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; } |