diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-06 22:21:24 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-06 22:21:24 -0700 |
| commit | ac76af0e2d81c777eb1fafbce09a7e60ca73ffbc (patch) | |
| tree | d028d4a957789f3a020cdf77184f9663121f34d7 /indra/newview | |
| parent | 3f8d4f1ab5bf03ff5df522c964269a345927ddde (diff) | |
| parent | d950a97af099b4560753957ccf8f2d69102f20c6 (diff) | |
STORM-299 : merge
Diffstat (limited to 'indra/newview')
| -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; } |