automated merge PE->viewer2.0

1 files changed, 1 insertions, 20 deletions

diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index 26f9824f9c..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);
@@ -744,9 +745,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 +903,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