summaryrefslogtreecommitdiff
path: root/indra/newview/llagentpicksinfo.cpp
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-04 11:44:32 +0800
committerangela <angela@lindenlab.com>2009-11-04 11:44:32 +0800
commit1190b5d9eb6f1e1d698430957b99872abd354f81 (patch)
tree82915d4b684aaa4cae2d61ebc46a678fcf018c48 /indra/newview/llagentpicksinfo.cpp
parentb4af6c3da8e5ef3e897cedfb2e1d677a3f37abe9 (diff)
parent3e3ef5c53d2e73c0836ef6056d222c4c35b8ac2d (diff)
merge
Diffstat (limited to 'indra/newview/llagentpicksinfo.cpp')
-rw-r--r--indra/newview/llagentpicksinfo.cpp3
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()