diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-02-14 17:09:42 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-02-14 17:09:42 -0600 |
| commit | 54b1847b3ca7678d7c9b65e9b8e701f6f9869b98 (patch) | |
| tree | 1fe459c59be947583095b55dd8b5b316ea2f56c9 /indra/newview/llappviewer.cpp | |
| parent | 4f18f9d6bd1e11b92040fbcc5ca1c2a173d38fc9 (diff) | |
SH-2973 Rearrange shutdown operations to prevent crash on exit on OSX
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3a257e1f1c..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(); @@ -1769,8 +1772,6 @@ bool LLAppViewer::cleanup() LLAvatarIconIDCache::getInstance()->save(); - gAgentAvatarp = NULL; - LLViewerMedia::saveCookieFile(); // Stop the plugin read thread if it's running. |