diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-09-19 19:20:21 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-09-19 19:20:21 +0300 |
| commit | fcb010e835d9b894ba6d1012ac8e3a85c5ab3400 (patch) | |
| tree | c7b94a915c4ed09c863bd9ef13183afc86d6ea6d /indra/newview/llavatariconctrl.cpp | |
| parent | 86ac47474f42598d3edb65970117b442457f7284 (diff) | |
CHUI-338 FIXED (LLAvatarNameResponder warning shown in debug console when using spinner to page through chat history viewer)
- Trying to restore avatarID by its name before appending message to chat history.
- Also prevented requesting avatar name by null LLUUID in LLAvatarIconCtrl::setValue
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
| -rwxr-xr-x | indra/newview/llavatariconctrl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp index b539ac38ed..62c6c6763b 100755 --- a/indra/newview/llavatariconctrl.cpp +++ b/indra/newview/llavatariconctrl.cpp @@ -245,9 +245,10 @@ void LLAvatarIconCtrl::setValue(const LLSD& value) LLIconCtrl::setValue(value); } - LLAvatarNameCache::get(mAvatarId, - boost::bind(&LLAvatarIconCtrl::onAvatarNameCache, - this, _1, _2)); + if (mAvatarId != LLUUID::null) + { + LLAvatarNameCache::get(mAvatarId, boost::bind(&LLAvatarIconCtrl::onAvatarNameCache, this, _1, _2)); + } } bool LLAvatarIconCtrl::updateFromCache() |