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

- fixed : clicking the "Chat" toolbar button doesn't close the nearby chat floater if it's hosted 

--HG--
branch : Chat-NearbyChat
meow-7.2.2
Kitty Barnett 2011-11-23 21:09:31 +01:00
parent 0256c73300
commit 7781d8ea40
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/llui/llfloaterreg.cpp
View File

@ -502,21 +502,25 @@ void LLFloaterReg::toggleInstanceOrBringToFront(const LLSD& sdname, const LLSD&
instance->openFloater(key);
instance->setVisibleAndFrontmost();
}
else if (!instance->isFrontmost())
{
instance->setVisibleAndFrontmost();
}
// [SL:KB] - Patch: Chat-NearbyChatBar | Checked: 2011-11-23 (Catznip-3.2.0b) | Modified: Catznip-3.2.0b
else
{
// instance->closeFloater();
// [SL:KB] - Patch: Chat-NearbyChatBar | Checked: 2011-11-17 (Catznip-3.2.0a) | Added: Catznip-3.2.0a
// When toggling *visibility*, close the host instead of the floater when hosted
if (instance->getHost())
instance->getHost()->closeFloater();
// Give focus to, or close, the host rather than the floater when hosted
LLFloater* floaterp = (!instance->getHost()) ? instance : instance->getHost();
if (!floaterp->isFrontmost())
floaterp->setVisibleAndFrontmost();
else
instance->closeFloater();
// [/SL:KB]
floaterp->closeFloater();
}
// [/SL:KB]
// else if (!instance->isFrontmost())
// {
// instance->setVisibleAndFrontmost();
// }
// else
// {
// instance->closeFloater();
// }
}
// static