diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-23 18:14:39 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-23 18:14:39 +0200 |
| commit | 568adbcdb0d9ab4151b1aeb54181c20a15e5f798 (patch) | |
| tree | 641bfc6219a62c0a3aede37d1a19b18b486c4785 /indra/newview/llbottomtray.cpp | |
| parent | dd20b16ed084b936d2e6c11a48aa34d83828aab5 (diff) | |
| parent | d741d040bc0f06f573b4a2507fba2b245191c36d (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 4d5d416907..976b312509 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -148,6 +148,12 @@ void LLBottomTray::sessionAdded(const LLUUID& session_id, const std::string& nam { if (!getChicletPanel()) 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 (getChicletPanel()->findChiclet<LLChiclet>(session_id)) return; LLIMChiclet* chiclet = createIMChiclet(session_id); |