diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-06 11:00:47 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-06 11:00:47 -0400 |
| commit | 2d8b53854ebc1db5cceda1e1b5d6abbbc6c08728 (patch) | |
| tree | 56388b12b66b42059841faeadac6f110abc18d21 /indra/newview/llgrouplist.cpp | |
| parent | e0cb5438a5055c71191c6ae6b27c7dee63e40562 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
merge
Diffstat (limited to 'indra/newview/llgrouplist.cpp')
| -rwxr-xr-x | indra/newview/llgrouplist.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index ef238cefe3..6126db2988 100755 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -30,7 +30,7 @@ // libs #include "llbutton.h" -#include "lliconctrl.h" +#include "llgroupiconctrl.h" #include "llmenugl.h" #include "lltextbox.h" #include "lltextutil.h" @@ -319,7 +319,7 @@ LLGroupListItem::~LLGroupListItem() //virtual BOOL LLGroupListItem::postBuild() { - mGroupIcon = getChild<LLIconCtrl>("group_icon"); + mGroupIcon = getChild<LLGroupIconCtrl>("group_icon"); mGroupNameBox = getChild<LLTextBox>("group_name"); mInfoBtn = getChild<LLButton>("info_btn"); @@ -381,7 +381,7 @@ void LLGroupListItem::setGroupIconID(const LLUUID& group_icon_id) { if (group_icon_id.notNull()) { - mGroupIcon->setValue(group_icon_id); + mGroupIcon->setIconId(group_icon_id); } } |