diff options
author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-06-22 20:16:56 +0300 |
---|---|---|
committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-06-22 20:16:56 +0300 |
commit | c148c1d6d904785db0b8df09038be0184faa0317 (patch) | |
tree | fd598bb4dd3f4eea25464a6437ccce6f96a9e801 /indra/newview/llavatariconctrl.cpp | |
parent | e0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff) | |
parent | 9b021ec787d05881bb0804c77896aa85d4ccdfe9 (diff) |
merge changes for MAINT-4734
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; |