diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-29 10:11:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-29 10:11:57 -0400 |
| commit | 848c1909c5879ac2ef2a5d40c756269aa0a40179 (patch) | |
| tree | 46a8d2bebe234de772ed7a071268887332edbda3 /indra/newview/llavatariconctrl.cpp | |
| parent | 4b05ac4ce1b8262db94b4902987efbb5eea03e49 (diff) | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
merge changes for 3.8.6-release
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; |