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

FIRE-9663 / FIRE-9928: Proposed fix for various issues with group floaters jumping and loosing focus

meow-7.2.2
Ansariel 2013-05-06 15:13:38 +02:00
parent f555e3fee8
commit 7d77133509
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/fsfloatergroup.cpp
View File

@ -112,13 +112,16 @@ FSFloaterGroup* FSFloaterGroup::openGroupFloater(const LLSD& params)
}
FSFloaterGroup* floater = LLFloaterReg::getTypedInstance<FSFloaterGroup>("fs_group", LLSD().with("group_id", params.get("group_id").asUUID()));
if (floater)
if (floater->getVisible())
{
floater->onOpen(params);
}
else
{
floater->openFloater(params);
return floater;
}
return NULL;
return floater;
}
// static

4
indra/newview/llpanelgroup.cpp
View File

@ -663,10 +663,6 @@ void LLPanelGroup::showNotice(const std::string& subject,
{
FSFloaterGroup* floater = FSFloaterGroup::findInstance(group_id);
if (!floater)
{
floater = FSFloaterGroup::openGroupFloater(group_id);
}
if (!floater)
{
return;
}