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

CHUI-589 (Conversation floater displays wrong IM floater when receiving a new message) 

additional fix
meow-7.2.2
MaximB ProductEngine 2012-12-12 23:35:52 +02:00
parent 9c145d88a6
commit e90bd165c8
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloaterimcontainer.cpp
View File

@ -101,16 +101,6 @@ void LLFloaterIMContainer::sessionAdded(const LLUUID& session_id, const std::str
{
addConversationListItem(session_id);
LLFloaterIMSessionTab::addToHost(session_id);
// If session was added while floater is not visible, conversation should not change
if (!isVisible(this))
{
LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(mSelectedSession);
if (session_floater->getHost())
{
selectFloater(session_floater);
}
}
}
void LLFloaterIMContainer::sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id)

2
indra/newview/llfloaterimsessiontab.cpp
View File

@ -167,7 +167,7 @@ void LLFloaterIMSessionTab::addToHost(const LLUUID& session_id)
if (!conversp->isNearbyChat()
|| gSavedSettings.getBOOL("NearbyChatIsNotTornOff"))
{
floater_container->addFloater(conversp, !floater_container->getVisible(), LLTabContainer::RIGHT_OF_CURRENT);
floater_container->addFloater(conversp, false, LLTabContainer::RIGHT_OF_CURRENT);
}
else
{