diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-19 15:05:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-19 15:05:20 -0700 |
| commit | c0842339e72b15331a5bbb6bd41324c28916d678 (patch) | |
| tree | 080dcbd5fc189e54933eaeee8bfbcbae09d92591 /indra/newview/llchicletbar.cpp | |
| parent | 3af9d7c0535c8d94b194952c98196bac1d8c3dda (diff) | |
CHUI-138 : Suppress chiclets for conversations when using tabbed UI; Make sure list is cleaned up on close
Diffstat (limited to 'indra/newview/llchicletbar.cpp')
| -rw-r--r-- | indra/newview/llchicletbar.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp index 8701b602ce..54a49ca49c 100644 --- a/indra/newview/llchicletbar.cpp +++ b/indra/newview/llchicletbar.cpp @@ -102,6 +102,13 @@ void LLChicletBar::sessionAdded(const LLUUID& session_id, const std::string& nam // no need to spawn chiclets for participants in P2P calls called through Avaline if (session->isP2P() && session->isOtherParticipantAvaline()) return; + // Do not spawn chiclet when using the new multitab conversation UI + if (LLIMConversation::isChatMultiTab()) + { + LLIMFloater::addToHost(session_id); + return; + } + if (getChicletPanel()->findChiclet<LLChiclet>(session_id)) return; LLIMChiclet* chiclet = createIMChiclet(session_id); @@ -109,7 +116,7 @@ void LLChicletBar::sessionAdded(const LLUUID& session_id, const std::string& nam { chiclet->setIMSessionName(name); chiclet->setOtherParticipantId(other_participant_id); - + LLIMFloater::onIMChicletCreated(session_id); } |