diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-23 14:40:52 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-23 14:40:52 +0200 |
| commit | d07fd64b6fc3f4c6af648ec43b84cd82c7e62fc6 (patch) | |
| tree | 17059acefad953dcbe05d9e9c60e46f0e5af8650 /indra/newview/llsyswellwindow.cpp | |
| parent | 3f43e07b33942c54bf81aac1d466c3eb771b8a8d (diff) | |
finished EXT-1912 Add handling restrictions of PSTN P2P calls in new IM Floaters
chiclets for avaline calls are not spawned anymore
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llsyswellwindow.cpp')
| -rw-r--r-- | indra/newview/llsyswellwindow.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 8c6ea59407..3cddf6d902 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -743,9 +743,13 @@ BOOL LLIMWellWindow::postBuild() void LLIMWellWindow::sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) { - if (mMessageList->getItemByValue(session_id)) return; + LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(session_id); + if (!session) return; + + // no need to spawn chiclets for participants in P2P calls called through Avaline + if (session->isP2P() && session->isOtherParticipantAvaline()) return; - if (!gIMMgr->hasSession(session_id)) return; + if (mMessageList->getItemByValue(session_id)) return; addIMRow(session_id, 0, name, other_participant_id); reshapeWindow(); |