diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-01 15:35:13 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-01 15:35:13 -0800 |
| commit | ed60f5b2d52a96f6144e611257b796fdcd561b7e (patch) | |
| tree | 9f096fae94a2dfb4dcca64973890566dd13e3df9 /indra/newview/llappviewer.cpp | |
| parent | 91028d2b3ba7c7bc2f32457f13f7deec06f4586e (diff) | |
| parent | ca36a06d2e994178cecfae249f7f1cc3af3554a0 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 261553599b..c1217fc402 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1488,6 +1488,9 @@ void LLAppViewer::flushVFSIO() bool LLAppViewer::cleanup() { + //ditch LLVOAvatarSelf instance + gAgentAvatarp = NULL; + // workaround for DEV-35406 crash on shutdown LLEventPumps::instance().reset(); |