summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2012-10-12 20:10:13 +0300
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2012-10-12 20:10:13 +0300
commit19c5b35a86dbe641fe397baf9a8194d78e440af8 (patch)
tree9cb3d04a691a594ee0b7ccba4a52afa1f314f31b /indra/newview/llimview.cpp
parent9aa03f0bf284bbfa3f50883351c6e39f7ffa41c5 (diff)
CHUI-385 FIXED All user's do not receive ad hoc messages after adding a user to a conversation
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index a604c884ca..aa5b9ce006 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -643,6 +643,12 @@ void LLIMModel::processSessionInitializedReply(const LLUUID& old_session_id, con
{
session->sessionInitReplyReceived(new_session_id);
+ if (old_session_id != new_session_id)
+ {
+ mId2SessionMap.erase(old_session_id);
+ mId2SessionMap[new_session_id] = session;
+ }
+
LLIMFloater* im_floater = LLIMFloater::findInstance(old_session_id);
if (im_floater)
{
@@ -651,9 +657,6 @@ void LLIMModel::processSessionInitializedReply(const LLUUID& old_session_id, con
if (old_session_id != new_session_id)
{
- mId2SessionMap.erase(old_session_id);
- mId2SessionMap[new_session_id] = session;
-
gIMMgr->notifyObserverSessionIDUpdated(old_session_id, new_session_id);
}