diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-21 15:54:02 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-21 15:54:02 -0400 |
| commit | 4eab82d5e2d71f9b0d53f5a92bc65ecc3320fee7 (patch) | |
| tree | 0298f612d60eef5a3bea57e625b2582f50d37c44 /indra/newview/llavatariconctrl.cpp | |
| parent | c838c6b64563545c15006ac20fd88afe66e5bbfc (diff) | |
| parent | 17f98b36d3e3bebdcb331f91fc0f542f618be71d (diff) | |
merge
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
| -rw-r--r-- | indra/newview/llavatariconctrl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp index 87b8d807c4..abb79b53a7 100644 --- a/indra/newview/llavatariconctrl.cpp +++ b/indra/newview/llavatariconctrl.cpp @@ -244,7 +244,10 @@ void LLAvatarIconCtrl::setValue(const LLSD& value) LLIconCtrl::setValue(value); } - gCacheName->get(mAvatarId, FALSE, boost::bind(&LLAvatarIconCtrl::nameUpdatedCallback, this, _1, _2, _3, _4)); + if (gCacheName) + { + gCacheName->get(mAvatarId, FALSE, boost::bind(&LLAvatarIconCtrl::nameUpdatedCallback, this, _1, _2, _3, _4)); + } } bool LLAvatarIconCtrl::updateFromCache() |