diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-12 23:35:52 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-12 23:35:52 +0200 |
| commit | e90bd165c8f41ac4a670d6c52a7ee2d7b3728991 (patch) | |
| tree | 38813587b6738c534f9cae5c11aa07d7c28ce339 /indra | |
| parent | 9c145d88a667c20a550884d75b6616b11ebc8104 (diff) | |
CHUI-589 (Conversation floater displays wrong IM floater when receiving a new message)
additional fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 054379c064..3b98c6d98c 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -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) diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 4c6d8fa5a0..4d923913fb 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -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 { |