livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-356 FIXED Call notifyObserverSessionIDUpdated() only after initing IM floater with new session id

meow-7.2.2
maxim_productengine 2012-10-11 19:58:26 +03:00
parent 82e5649fba
commit 0ff5a0c8ce
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llimview.cpp
View File

@ -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)
{