Skip to content
Snippets Groups Projects
Commit ac76af0e authored by Merov Linden's avatar Merov Linden
Browse files

STORM-299 : merge

parents 3f8d4f1a d950a97a
No related branches found
No related tags found
No related merge requests found
...@@ -124,7 +124,9 @@ BOOL LLFloaterMap::postBuild() ...@@ -124,7 +124,9 @@ BOOL LLFloaterMap::postBuild()
BOOL LLFloaterMap::handleDoubleClick( S32 x, S32 y, MASK mask ) 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; return TRUE;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment