diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
| commit | fa3b57bd9f0afcf2d38dae27d4b9765624baf758 (patch) | |
| tree | ff083f4e4eec5d6d4e9191f34cae6450e0a318ac /indra/newview/llagentpicksinfo.cpp | |
| parent | 0e63920569302a4f6afcbc0feb28ff379e4a4bac (diff) | |
| parent | b806edf4ac47d18e1a43fb8dbb5fbcad8d13192f (diff) | |
Merge the work lost in 49c9461937df back into the tree
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() |