summaryrefslogtreecommitdiff
path: root/indra/newview/llavatariconctrl.cpp
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2015-06-22 20:16:56 +0300
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2015-06-22 20:16:56 +0300
commitc148c1d6d904785db0b8df09038be0184faa0317 (patch)
treefd598bb4dd3f4eea25464a6437ccce6f96a9e801 /indra/newview/llavatariconctrl.cpp
parente0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff)
parent9b021ec787d05881bb0804c77896aa85d4ccdfe9 (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;