diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-15 13:59:05 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-15 13:59:05 -0700 |
| commit | 7b5006a21141e66d83c5d34676c3b20f63a69bfc (patch) | |
| tree | 66058223cd738fa2d249a08ec5e373e095035348 /indra/newview/llimview.cpp | |
| parent | 5a5df259ffc23a6289d25deac906047a7356fb42 (diff) | |
| parent | f609f4cca3a91c8d6ea7c55b61d0b2cfd29be6b7 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index eea59c223a..115da54ec8 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); } |