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

Conversations floater: Make sure the contacts and nearby chat floater get added in the correct order and at the correct location

Ansariel 2014-03-21 23:40:13 +01:00
parent 45a786064b
commit 0739436b02
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/fsfloaterimcontainer.cpp
View File

@ -117,7 +117,7 @@ void FSFloaterIMContainer::onOpen(const LLSD& key)
}
else
{
LLMultiFloater::showFloater(floater_contacts);
addFloater(floater_contacts, TRUE);
}
}
@ -135,7 +135,7 @@ void FSFloaterIMContainer::onOpen(const LLSD& key)
}
else
{
LLMultiFloater::showFloater(floater_chat);
addFloater(floater_chat, TRUE);
}
}
@ -175,7 +175,7 @@ void FSFloaterIMContainer::addFloater(LLFloater* floaterp,
else
{
// add chat history as second tab if contact window is present, first tab otherwise
if (getChildView("imcontacts"))
if (dynamic_cast<FSFloaterContacts*>(mTabContainer->getPanelByIndex(0)))
{
// assuming contacts window is first tab, select it
mTabContainer->selectFirstTab();