diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-03 17:33:03 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-03 17:33:03 +0200 |
commit | 506f1787a5e3c98c60e10a00e6197303d28eb03a (patch) | |
tree | 9da32a06c41da5e5a56bc49fcb562546a652db02 /indra/newview/llagentpicksinfo.cpp | |
parent | f1d834c50d7155102a6482e1c4e4205ddca65be2 (diff) | |
parent | efa9c7a5ba1fa1facaa15d22418e9d4199c3f773 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llagentpicksinfo.cpp')
-rw-r--r-- | indra/newview/llagentpicksinfo.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llagentpicksinfo.cpp b/indra/newview/llagentpicksinfo.cpp index 6e5835bace..3c8d0dac42 100644 --- a/indra/newview/llagentpicksinfo.cpp +++ b/indra/newview/llagentpicksinfo.cpp @@ -47,7 +47,8 @@ public: ~LLAgentPicksObserver() { - LLAvatarPropertiesProcessor::getInstance()->removeObserver(gAgent.getID(), this); + if (LLAvatarPropertiesProcessor::instanceExists()) + LLAvatarPropertiesProcessor::getInstance()->removeObserver(gAgent.getID(), this); } void sendAgentPicksRequest() |