summaryrefslogtreecommitdiff
path: root/indra/newview/llavatariconctrl.cpp
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2015-07-15 22:59:59 +0300
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2015-07-15 22:59:59 +0300
commit9131f7705974c84127bcc3109d2ab1c56cb1f009 (patch)
tree59b7494d361a9ad570ed3bcec9efdb6a5dff6166 /indra/newview/llavatariconctrl.cpp
parent02441157a0d22619ccf2a2ee735c8f5251b54fdb (diff)
parent3d4433de504c0ac17f2d3d98d3cbc43955cc1dda (diff)
merge changes for MAINT-4734
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
-rwxr-xr-xindra/newview/llavatariconctrl.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index 281e591b48..25a5df9781 100755
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -311,6 +311,7 @@ bool LLAvatarIconCtrl::updateFromCache()
else
{
LLIconCtrl::setValue(mDefaultIconName);
+ return false;
}
return true;