diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-29 13:50:37 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-29 13:50:37 -0400 |
| commit | 0ffc73855b02bf4679c42cdb20e00544922f8407 (patch) | |
| tree | 8445978462f3f98b41f58fe48f7a89b835ebe022 /indra/newview/llviewerobjectlist.cpp | |
| parent | b6e7850c0a3d65ed0a1501e19a1655055000e32f (diff) | |
EXT-6536 : Make LLVOAvatarSelf a singleton
Fix for cleaning up gAgentAvatar on app shutdown.
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 5e0bd5b811..752aeaaab0 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -949,7 +949,8 @@ void LLViewerObjectList::killAllObjects() { objectp = *iter; killObject(objectp); - llassert(objectp->isDead()); + // Object must be dead, or it's the LLVOAvatarSelf which never dies. + llassert((objectp == gAgentAvatarp) || objectp->isDead()); } cleanDeadObjects(FALSE); |