diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2012-10-11 19:58:26 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2012-10-11 19:58:26 +0300 |
| commit | 0ff5a0c8ceebfab0d786aaf027c7c548170afe8d (patch) | |
| tree | e6c8c5592fdd925c04b65a64a165c8d65456f1ff /indra/newview/llimview.cpp | |
| parent | 82e5649fba22f7fa0cb4744f632aa836f0855f85 (diff) | |
CHUI-356 FIXED Call notifyObserverSessionIDUpdated() only after initing IM floater with new session id
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index b45903835a..a604c884ca 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); + LLIMFloater* im_floater = LLIMFloater::findInstance(old_session_id); + if (im_floater) + { + im_floater->sessionInitReplyReceived(new_session_id); + } + if (old_session_id != new_session_id) { mId2SessionMap.erase(old_session_id); @@ -651,12 +657,6 @@ void LLIMModel::processSessionInitializedReply(const LLUUID& old_session_id, con gIMMgr->notifyObserverSessionIDUpdated(old_session_id, new_session_id); } - LLIMFloater* im_floater = LLIMFloater::findInstance(old_session_id); - if (im_floater) - { - im_floater->sessionInitReplyReceived(new_session_id); - } - // auto-start the call on session initialization? if (session->mStartCallOnInitialize) { |