summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupiconctrl.cpp
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2016-05-10 14:59:33 -0700
committerGlenn Glazer <coyot@lindenlab.com>2016-05-10 14:59:33 -0700
commitdf55966b112142e194f07386a3673f395ec792fc (patch)
tree481234ace0fa5a95c0f135b7aa35872a8fa1946d /indra/newview/llgroupiconctrl.cpp
parenta670914c6d43dcde0677680375f53f8a67a89cf6 (diff)
parent94559950a2c670990db56bd74e65d26652421b8c (diff)
merge
Diffstat (limited to 'indra/newview/llgroupiconctrl.cpp')
-rwxr-xr-xindra/newview/llgroupiconctrl.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llgroupiconctrl.cpp b/indra/newview/llgroupiconctrl.cpp
index 1974a073dd..271dd44c1f 100755
--- a/indra/newview/llgroupiconctrl.cpp
+++ b/indra/newview/llgroupiconctrl.cpp
@@ -64,7 +64,8 @@ LLGroupIconCtrl::LLGroupIconCtrl(const LLGroupIconCtrl::Params& p)
}
else
{
- LLIconCtrl::setValue(mDefaultIconName);
+ //TODO: Consider implementing dedicated setDefault() function instead of passing priority for local file
+ LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI);
}
}
@@ -73,6 +74,11 @@ LLGroupIconCtrl::~LLGroupIconCtrl()
LLGroupMgr::getInstance()->removeObserver(this);
}
+void LLGroupIconCtrl::setIconId(const LLSD& value)
+{
+ LLIconCtrl::setValue(value);
+}
+
void LLGroupIconCtrl::setValue(const LLSD& value)
{
if (value.isUUID())
@@ -91,7 +97,7 @@ void LLGroupIconCtrl::setValue(const LLSD& value)
// Check if cache already contains image_id for that group
if (!updateFromCache())
{
- LLIconCtrl::setValue(mDefaultIconName);
+ LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI);
gm->addObserver(this);
gm->sendGroupPropertiesRequest(mGroupId);
}
@@ -122,7 +128,7 @@ bool LLGroupIconCtrl::updateFromCache()
}
else
{
- LLIconCtrl::setValue(mDefaultIconName);
+ LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI);
}
if (mDrawTooltip && !group_data->mName.empty())