diff options
| author | Aura Linden <aura@lindenlab.com> | 2015-10-27 15:33:21 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2015-10-27 15:33:21 -0700 |
| commit | 07496b015b01899b21960b60d2f3af7bf317c349 (patch) | |
| tree | f44564827e1570113457f2312ee23073135233bc /indra/newview/llavatariconctrl.cpp | |
| parent | 97374a5362f097afd3027ea51757de2e36af4798 (diff) | |
| parent | cb64c3d3c3ca027fc49ef655e2ce0acecb3b230d (diff) | |
Pulled merge from bento prime.
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; |