livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-299 : merge

meow-7.2.2
Merov Linden 2010-10-06 22:21:24 -07:00
parent 3f8d4f1ab5 d950a97af0
commit ac76af0e2d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloatermap.cpp
View File

@ -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;
}