diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-02-22 14:02:15 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-02-22 14:02:15 -0500 |
| commit | 167a7dcd2fec57c8f93e3731679ea61bbd040b79 (patch) | |
| tree | 970a8ea7bf976ca1ae74a37103452219d4027289 /indra/newview/llappviewer.cpp | |
| parent | e5f81fdcc98ded831c48c4e31a4a215877e0a1e4 (diff) | |
| parent | 52782548c83dc0ca0fc8352e1a3ad68784116a91 (diff) | |
merge
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(); |