summaryrefslogtreecommitdiff
path: root/indra/newview/llblockedlistitem.cpp
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2012-06-22 20:05:35 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2012-06-22 20:05:35 +0300
commitafc6a7e6baeb9b568feb31cfd8eb978bb485c0c6 (patch)
tree140908fa1d277a1482b2912d9cf56519d8995c03 /indra/newview/llblockedlistitem.cpp
parent3807f97facc79960c579793376412a0baf6b9de3 (diff)
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
Diffstat (limited to 'indra/newview/llblockedlistitem.cpp')
-rw-r--r--indra/newview/llblockedlistitem.cpp11
1 files changed, 10 insertions, 1 deletions
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;