diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-16 15:30:33 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-16 15:30:33 +0200 |
| commit | 9dd2b290318f657b3dca81278f597cc702a6e149 (patch) | |
| tree | 12fca0ae49b009cf0532e8fdaa7ffb4dcd9c1742 /indra/newview/llsyswellwindow.cpp | |
| parent | 734f37816ef35089bc0f5710dc1f9684bc5b9b69 (diff) | |
fixed EXT-2884 Initiation of a voice call should not bring text chat (p2p, ad-hoc, group)
Added flag to an LLIMSession which indicated whether it has been created for a voice call.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llsyswellwindow.cpp')
| -rw-r--r-- | indra/newview/llsyswellwindow.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index ea49f9c32e..f49e7ef0da 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -709,15 +709,15 @@ BOOL LLIMWellWindow::postBuild() void LLIMWellWindow::sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) { - if (mMessageList->getItemByValue(session_id) == NULL) - { - S32 chicletCounter = LLIMModel::getInstance()->getNumUnread(session_id); - if (chicletCounter > -1) - { - addIMRow(session_id, chicletCounter, name, other_participant_id); - reshapeWindow(); - } - } + if (!mMessageList->getItemByValue(session_id)) return; + + // For im sessions started as voice call chiclet gets created on the first incoming message + if (gIMMgr->isVoiceCall(session_id)) return; + + if (!gIMMgr->hasSession(session_id)) return; + + addIMRow(session_id, 0, name, other_participant_id); + reshapeWindow(); } //virtual |