diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-08-17 20:35:00 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-08-17 20:35:00 +0300 |
| commit | 0f061689914d1d73272d373c877d1656933ae501 (patch) | |
| tree | 6ff7ac3b6eedae4449c8d3609458c940ef0ce3ba /indra/newview/llgroupiconctrl.cpp | |
| parent | 57060fa0ebfacf3705ec2d9770e83aab3c86b894 (diff) | |
MAINT-6655 Group inspector doesn't support default icon.
Diffstat (limited to 'indra/newview/llgroupiconctrl.cpp')
| -rw-r--r-- | indra/newview/llgroupiconctrl.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llgroupiconctrl.cpp b/indra/newview/llgroupiconctrl.cpp index 271dd44c1f..7c2a3cad43 100644 --- a/indra/newview/llgroupiconctrl.cpp +++ b/indra/newview/llgroupiconctrl.cpp @@ -74,9 +74,16 @@ LLGroupIconCtrl::~LLGroupIconCtrl() LLGroupMgr::getInstance()->removeObserver(this); } -void LLGroupIconCtrl::setIconId(const LLSD& value) +void LLGroupIconCtrl::setIconId(const LLUUID& icon_id) { - LLIconCtrl::setValue(value); + if (icon_id.notNull()) + { + LLIconCtrl::setValue(icon_id); + } + else + { + LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI); + } } void LLGroupIconCtrl::setValue(const LLSD& value) @@ -122,14 +129,7 @@ bool LLGroupIconCtrl::updateFromCache() LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(mGroupId); if (!group_data) return false; - if (group_data->mInsigniaID.notNull()) - { - LLIconCtrl::setValue(group_data->mInsigniaID); - } - else - { - LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI); - } + setIconId(group_data->mInsigniaID); if (mDrawTooltip && !group_data->mName.empty()) { |