From afc6a7e6baeb9b568feb31cfd8eb978bb485c0c6 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 22 Jun 2012 20:05:35 +0300
Subject: CHUI-136 ADDITIONAL FIX (Implement new design for blocked list on the
 people floater)

- If mute item type is LLMute::BY_NAME it means that it's an object and we should show corresponding icon
- Also added icon for blocked groups
---
 indra/newview/llblockedlistitem.cpp                           | 11 ++++++++++-
 .../newview/skins/default/xui/en/panel_blocked_list_item.xml  | 10 ++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llblockedlistitem.cpp b/indra/newview/llblockedlistitem.cpp
index 14da35c85a..d9afd2b629 100644
--- a/indra/newview/llblockedlistitem.cpp
+++ b/indra/newview/llblockedlistitem.cpp
@@ -38,6 +38,7 @@
 
 // newview
 #include "llavatariconctrl.h"
+#include "llgroupiconctrl.h"
 #include "llinventoryicon.h"
 #include "llviewerobject.h"
 
@@ -58,14 +59,22 @@ BOOL LLBlockedListItem::postBuild()
 	switch (mMuteType)
 	{
 	case LLMute::AGENT:
+	case LLMute::EXTERNAL:
 		{
 			LLAvatarIconCtrl* avatar_icon = getChild<LLAvatarIconCtrl>("avatar_icon");
 			avatar_icon->setVisible(TRUE);
 			avatar_icon->setValue(mItemID);
 		}
 		break;
-
+	case LLMute::GROUP:
+		{
+			LLGroupIconCtrl* group_icon = getChild<LLGroupIconCtrl>("group_icon");
+			group_icon->setVisible(TRUE);
+			group_icon->setValue(mItemID);
+		}
+		break;
 	case LLMute::OBJECT:
+	case LLMute::BY_NAME:
 		getChild<LLUICtrl>("object_icon")->setVisible(TRUE);
 		break;
 
diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
index a63a14ca69..84e7e467b1 100644
--- a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
@@ -37,6 +37,16 @@
      top="2"
      visible="false"
      width="20" />
+    <group_icon
+     default_icon_name="Generic_Group"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
     <icon
      follows="top|left"
      height="16"
-- 
cgit v1.2.3