summaryrefslogtreecommitdiff
path: root/indra/newview/llavatariconctrl.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <andreylproductengine@lindenlab.com>2015-10-27 08:00:28 +0200
committerAndreyL ProductEngine <andreylproductengine@lindenlab.com>2015-10-27 08:00:28 +0200
commit7f39e2583ffffee5866663ebf8798f393fc67570 (patch)
tree0babf6af77d62b9408d059813d4ff81df7ff75d5 /indra/newview/llavatariconctrl.cpp
parentcf53c157fe46eb02568101a51c43a41ee2a4cd18 (diff)
parent84150294b912d04e345007b65670c0230a2e4d79 (diff)
Merge downstream, version 3.8.7
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;