applying patch for EXT-2357

--HG--
branch : product-engine

1 files changed, 9 insertions, 1 deletions

diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index 22eb9a51d2..7c7a4222d4 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -111,6 +111,14 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp,
 	else
 	{
 		LLUUID avatar_id = LLIMModel::getInstance()->getOtherParticipantID(session_id);
+
+		LLAvatarIconCtrl::Params icon_params = LLUICtrlFactory::instance().getDefaultParams<LLAvatarIconCtrl>();
+		icon_params.avatar_id = avatar_id;
+		LLAvatarIconCtrl* icon = LLUICtrlFactory::instance().createWidget<LLAvatarIconCtrl>(icon_params);
+		icon->setValue(avatar_id);
+		mTabContainer->setTabImage(floaterp, icon);
+
+		/*
 		LLAvatarPropertiesProcessor& app = LLAvatarPropertiesProcessor::instance();
 		app.addObserver(avatar_id, this);
 		floaterp->mCloseSignal.connect(boost::bind(&LLIMFloaterContainer::onCloseFloater, this, avatar_id));
@@ -125,7 +133,7 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp,
 		{
 			mTabContainer->setTabImage(floaterp, "Generic_Person");
 			app.sendAvatarPropertiesRequest(avatar_id);
-		}
+		}*/
 	}
 }