diff options
| author | callum <none@none> | 2010-06-17 15:17:34 -0700 |
|---|---|---|
| committer | callum <none@none> | 2010-06-17 15:17:34 -0700 |
| commit | 2a60e057de637536b775153d619c3da202b0f8e5 (patch) | |
| tree | 8cd00307e883f9b476a88ba82aee3043cff26446 /indra/newview/llavatariconctrl.cpp | |
| parent | 107aee0c6eb17d6433de60e35d33dc4779a6a9e3 (diff) | |
| parent | 8d84b6e82d17eb11622b3d80254ccc4ac15c5bec (diff) | |
Merge with tip
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() |