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/llvoavatarself.cpp | |
| parent | b6e7850c0a3d65ed0a1501e19a1655055000e32f (diff) | |
EXT-6536 : Make LLVOAvatarSelf a singleton
Fix for cleaning up gAgentAvatar on app shutdown.
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index d58be21910..06c9af6c2f 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -518,10 +518,17 @@ BOOL LLVOAvatarSelf::buildMenus() return TRUE; } +LLVOAvatarSelf::cleanup() +{ + markDead(); + delete mScreenp; + mScreenp = NULL; + mRegionp = NULL; +} + LLVOAvatarSelf::~LLVOAvatarSelf() { - delete mScreenp; - mScreenp = NULL; + cleanup(); } /** |