diff options
author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-15 20:10:00 +0300 |
---|---|---|
committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-15 20:10:00 +0300 |
commit | 3a21eb59f1cf0b7672e2beb671e1dbc717e28b3f (patch) | |
tree | cba0242f33dad84ff8775c538b90e2eac9a357b7 /indra/newview/llimfloatercontainer.cpp | |
parent | c234ef4b3a1ab22132512958c324e5f796912144 (diff) |
CHUI-286 (Conversations floater opened by default when a new IM session is started (no IM toast shown): now floater silently adds itself to the container
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
-rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index fe47e03beb..bcad7adcce 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -75,13 +75,13 @@ LLIMFloaterContainer::~LLIMFloaterContainer() void LLIMFloaterContainer::sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) { - LLIMFloater::show(session_id); + LLIMFloater::addToIMContainer(session_id); addConversationListItem(session_id); } void LLIMFloaterContainer::sessionVoiceOrIMStarted(const LLUUID& session_id) { - LLIMFloater::show(session_id); + LLIMFloater::addToIMContainer(session_id); addConversationListItem(session_id); } @@ -93,8 +93,6 @@ void LLIMFloaterContainer::sessionIDUpdated(const LLUUID& old_session_id, const void LLIMFloaterContainer::sessionRemoved(const LLUUID& session_id) { - LLIMFloater* floaterp = LLIMFloater::findInstance(session_id); - LLFloater::onClickClose(floaterp); removeConversationListItem(session_id); } |