diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-21 09:55:30 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-21 09:55:30 -0500 |
| commit | 5f85e7a82458fff56aa79f7e7fe2986edc069ca3 (patch) | |
| tree | 01c9c6b6f6cb06b828d4e1d539b455a6a7ac7e9c /indra/newview/llappviewer.cpp | |
| parent | 1074219c8a44cbf6f3b1b0a68dd0ca8c656465fa (diff) | |
| parent | 52782548c83dc0ca0fc8352e1a3ad68784116a91 (diff) | |
merge changes for SH-2973
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 49fbdbf1df..1174d108d2 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1487,6 +1487,9 @@ void LLAppViewer::flushVFSIO() bool LLAppViewer::cleanup() { + //ditch LLVOAvatarSelf instance + gAgentAvatarp = NULL; + // workaround for DEV-35406 crash on shutdown LLEventPumps::instance().reset(); |