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

mplemented EXT-3395 “Docked IM/Chat windows shouldn't hide when voice control panel is opened”; 

--HG--
branch : product-engine
master
Alexei Arabadji 2009-12-15 19:10:27 +02:00
parent e303864c17
commit 7ba2f99ae0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llui/lldockablefloater.cpp
View File

@ -38,6 +38,8 @@
//static
LLHandle<LLFloater> LLDockableFloater::sInstanceHandle;
static const std::string VOICE_FLOATER("floater_voice_controls"), IM_FLOATER("panel_im");
//static
void LLDockableFloater::init(LLDockableFloater* thiz)
{
@ -114,9 +116,11 @@ void LLDockableFloater::resetInstance()
{
if (mUniqueDocking && sInstanceHandle.get() != this)
{
if (sInstanceHandle.get() != NULL && sInstanceHandle.get()->isDocked())
if (sInstanceHandle.get() != NULL && sInstanceHandle.get()->isDocked()
&& (getName() != VOICE_FLOATER || sInstanceHandle.get()->getName() != IM_FLOATER)
&& (getName() != IM_FLOATER || sInstanceHandle.get()->getName() != VOICE_FLOATER))
{
sInstanceHandle.get()->setVisible(FALSE);
sInstanceHandle.get()->setVisible(FALSE);
}
sInstanceHandle = getHandle();
}