From eb4f026181c83dfd2106cce3ab1fde6a3fe60ec3 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Mon, 21 Dec 2009 15:18:48 +0200 Subject: implemented EXT-3594 IM Chiclet should be created for voice calls also --HG-- branch : product-engine --- indra/newview/llsyswellwindow.cpp | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'indra/newview/llsyswellwindow.cpp') diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 26f9824f9c..9b60f58be1 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -744,9 +744,6 @@ void LLIMWellWindow::sessionAdded(const LLUUID& session_id, { 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); @@ -905,23 +902,6 @@ bool LLIMWellWindow::hasIMRow(const LLUUID& session_id) return mMessageList->getItemByValue(session_id); } -void LLIMWellWindow::onNewIM(const LLSD& data) -{ - LLUUID from_id = data["from_id"]; - if (from_id.isNull() || gAgentID == from_id) return; - - LLUUID session_id = data["session_id"]; - if (session_id.isNull()) return; - - if (!gIMMgr->isVoiceCall(session_id)) return; - - if (hasIMRow(session_id)) return; - - //first real message, time to create chiclet - addIMRow(session_id); -} - - void LLIMWellWindow::closeAll() { // Generate an ignorable alert dialog if there is an active voice IM sesion -- cgit v1.2.3 From 3c7e1435fe58a2a34fa838addd7cf822e48d3aa2 Mon Sep 17 00:00:00 2001 From: Dmitry Oleshko Date: Mon, 21 Dec 2009 20:14:39 +0200 Subject: workaround for (EXT-3599) No chiclets in the IM Well Window - manually set rect for a chiclet in the IM Well Window --HG-- branch : product-engine --- indra/newview/llsyswellwindow.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llsyswellwindow.cpp') diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 9b60f58be1..8c6ea59407 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -352,6 +352,7 @@ LLIMWellWindow::RowPanel::RowPanel(const LLSysWellWindow* parent, const LLUUID& } // Initialize chiclet. + mChiclet->setRect(LLRect(5, 28, 30, 3)); // *HACK: workaround for (EXT-3599) mChiclet->setChicletSizeChangedCallback(boost::bind(&LLIMWellWindow::RowPanel::onChicletSizeChanged, this, mChiclet, _2)); mChiclet->enableCounterControl(true); mChiclet->setCounter(chicletCounter); -- cgit v1.2.3