summaryrefslogtreecommitdiff
path: root/indra/newview/llavatariconctrl.cpp
diff options
context:
space:
mode:
authorRuslan Teliuk <ruslantproductengine@lindenlab.com>2015-10-27 18:11:47 +0200
committerRuslan Teliuk <ruslantproductengine@lindenlab.com>2015-10-27 18:11:47 +0200
commit7563bb647048725e144fea34ea3cba426eed0ad1 (patch)
tree55ca85ba1e195c74686162d2ece01b53e29f1610 /indra/newview/llavatariconctrl.cpp
parentdd7dc1b4cae00ecd78e8ecfd5bb25aa861503596 (diff)
parent2188da26bea8eff0538498c4e6caa69be53d6bbc (diff)
Merged lindenlab/viewer-lion into default
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;