diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-18 14:08:46 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-18 14:08:46 +0300 |
| commit | a8276dfd5998a7ef86668d7a8e3f9e8a7d124801 (patch) | |
| tree | edb2169b848d848d834fe6e418c397c10c89a5ff /indra/newview/llavatariconctrl.cpp | |
| parent | 9aa710945685a2cae8cfc622f3dc3d900c1ab4c9 (diff) | |
| parent | cb50a2395bc37f1f7833171a976f67af9f2df66d (diff) | |
Merge from default branch
--HG--
branch : product-engine
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() |