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 groupsmaster
parent
3807f97fac
commit
afc6a7e6ba
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in New Issue