diff options
author | callum_linden <none@none> | 2015-10-26 14:22:31 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2015-10-26 14:22:31 -0700 |
commit | a89e87c72e6a351c6d1c74ae59a2d7010578d26c (patch) | |
tree | 46b3774ade40f99d1b2d1645b8e619ff5b6dc1ce /indra/newview/llavatariconctrl.cpp | |
parent | 16cd296e30e95fbacefff4e291fbdd6fbf0c2c43 (diff) | |
parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) |
Merge with head of viewer release (3.8.6 changes)
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
-rwxr-xr-x | indra/newview/llavatariconctrl.cpp | 1 |
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; |