summaryrefslogtreecommitdiff
path: root/indra/newview/llavatariconctrl.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2016-05-23 16:50:56 -0700
committercallum_linden <none@none>2016-05-23 16:50:56 -0700
commit05fcb7c8126a3f3496d948affe7f2722c9ca8fad (patch)
tree159e542492c5c1fab1a04ef8a29b22fd60e4766a /indra/newview/llavatariconctrl.cpp
parent50ab1e57ec21f2009013b3bc061047887cdd07d5 (diff)
parentc2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff)
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
-rw-r--r--[-rwxr-xr-x]indra/newview/llavatariconctrl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index 932326acae..c131dc641b 100755..100644
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -196,7 +196,7 @@ LLAvatarIconCtrl::LLAvatarIconCtrl(const LLAvatarIconCtrl::Params& p)
}
else
{
- LLIconCtrl::setValue(mDefaultIconName);
+ LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI);
}
}
@@ -243,7 +243,7 @@ void LLAvatarIconCtrl::setValue(const LLSD& value)
// *TODO: Consider getting avatar icon/badge directly from
// People API, rather than sending AvatarPropertyRequest
// messages. People API already hits the user table.
- LLIconCtrl::setValue(mDefaultIconName);
+ LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI);
app->addObserver(mAvatarId, this);
app->sendAvatarPropertiesRequest(mAvatarId);
}
@@ -284,7 +284,7 @@ bool LLAvatarIconCtrl::updateFromCache()
}
else
{
- LLIconCtrl::setValue(mDefaultIconName);
+ LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI);
return false;
}