diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-21 15:47:08 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-21 15:47:08 -0700 |
| commit | bd4acad1c1df22f509633f6e504c3b44880673cc (patch) | |
| tree | 1959cca80114e8e98ea367ea507e4ec46d7cb684 /indra/newview/llavatariconctrl.cpp | |
| parent | 6dd2bf36c52fa00732ed5a3910539f38c91ff173 (diff) | |
| parent | 8b63f7f50367f5726d03fb784f5a2f0783470b9c (diff) | |
merging in latest changes
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() |