diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index d4164cf65e..0e52463549 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -67,6 +67,7 @@ LLAvatarListItem::Params::Params() voice_call_left_style("voice_call_left_style"), online_style("online_style"), offline_style("offline_style"), + group_moderator_style("group_moderator_style"), name_right_pad("name_right_pad",0) {}; @@ -312,6 +313,9 @@ void LLAvatarListItem::setState(EItemState item_style) case IS_OFFLINE: mAvatarNameStyle = params.offline_style(); break; + case IS_GROUPMOD: + mAvatarNameStyle = params.group_moderator_style(); + break; } // *NOTE: You cannot set the style on a text box anymore, you must @@ -783,6 +787,11 @@ LLAvatarListItem::icon_color_map_t& LLAvatarListItem::getItemIconColorMap() std::make_pair(IS_OFFLINE, LLUIColorTable::instance().getColor("AvatarListItemIconOfflineColor", LLColor4::white))); + // TS: Group moderators get the online color + item_icon_color_map.insert( + std::make_pair(IS_GROUPMOD, + LLUIColorTable::instance().getColor("AvatarListItemIconOnlineColor", LLColor4::white))); + return item_icon_color_map; } diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index f561c68657..67e39220d6 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -51,7 +51,9 @@ public: voice_call_joined_style, voice_call_left_style, online_style, - offline_style; + offline_style, + group_moderator_style; + Optional name_right_pad; @@ -65,6 +67,7 @@ public: IS_VOICE_LEFT, IS_ONLINE, IS_OFFLINE, + IS_GROUPMOD, } EItemState; /** diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index fb1153980a..a032e6993d 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -347,6 +347,7 @@ void LLParticipantList::onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param) tooltip.erase(found, moderator_indicator_len); item->setAvatarToolTip(tooltip); } + item->setState(LLAvatarListItem::IS_ONLINE); } } @@ -376,6 +377,7 @@ void LLParticipantList::onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param) tooltip += moderator_indicator; item->setAvatarToolTip(tooltip); } + item->setState(LLAvatarListItem::IS_GROUPMOD); } } diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml index 2a6b6571bf..7e248dc4cb 100644 --- a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml @@ -41,4 +41,10 @@ font="SansSerifSmall" font.style="NORMAL" color="SL-MidDkGray"/> + + + diff --git a/indra/newview/skins/default/xui/ru/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/ru/widgets/avatar_list_item.xml index 2a6b6571bf..7e248dc4cb 100644 --- a/indra/newview/skins/default/xui/ru/widgets/avatar_list_item.xml +++ b/indra/newview/skins/default/xui/ru/widgets/avatar_list_item.xml @@ -41,4 +41,10 @@ font="SansSerifSmall" font.style="NORMAL" color="SL-MidDkGray"/> + + + diff --git a/indra/newview/skins/starlight/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/starlight/xui/en/widgets/avatar_list_item.xml index 67b1392305..8f57c75e1c 100644 --- a/indra/newview/skins/starlight/xui/en/widgets/avatar_list_item.xml +++ b/indra/newview/skins/starlight/xui/en/widgets/avatar_list_item.xml @@ -42,4 +42,10 @@ font="SansSerifSmall" font.style="NORMAL" color="SL-MidDkGray"/> + + +