diff options
| author | andreykproductengine <none@none> | 2016-09-20 17:47:30 +0300 |
|---|---|---|
| committer | andreykproductengine <none@none> | 2016-09-20 17:47:30 +0300 |
| commit | c9cfa897d9a781b6781915d250bb8886c206cd3f (patch) | |
| tree | fc5c8cd3846ec9029a4549ca9a0543871adf13ef /indra | |
| parent | e638f635c81d2b380840e33acdc33ee692422153 (diff) | |
MAINT-6655 fixed group list and inspector not always switching to default icon
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llgrouplist.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llinspectgroup.cpp | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index 6126db2988..62414d3bbb 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -379,10 +379,7 @@ void LLGroupListItem::setGroupID(const LLUUID& group_id) void LLGroupListItem::setGroupIconID(const LLUUID& group_icon_id) { - if (group_icon_id.notNull()) - { - mGroupIcon->setIconId(group_icon_id); - } + mGroupIcon->setIconId(group_icon_id); } void LLGroupListItem::setGroupIconVisible(bool visible) diff --git a/indra/newview/llinspectgroup.cpp b/indra/newview/llinspectgroup.cpp index 0c5a91e48a..a4fce36783 100644 --- a/indra/newview/llinspectgroup.cpp +++ b/indra/newview/llinspectgroup.cpp @@ -41,6 +41,7 @@ #include "lltooltip.h" // positionViewNearMouse() #include "lltrans.h" #include "lluictrl.h" +#include "llgroupiconctrl.h" ////////////////////////////////////////////////////////////////////////////// // LLInspectGroup @@ -233,8 +234,7 @@ void LLInspectGroup::processGroupData() getChild<LLUICtrl>("group_details")->setValue( LLSD(data->mCharter) ); - // LLGroupIconCtrl - getChild<LLUICtrl>("group_icon")->setValue(LLSD(mGroupID)); + getChild<LLGroupIconCtrl>("group_icon")->setIconId(data->mInsigniaID); std::string cost; bool is_member = LLGroupActions::isInGroup(mGroupID); |