diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-03-25 15:25:35 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-03-25 15:25:35 +0200 |
| commit | 911472ed08490cbc08ba5009be82b247c51102a7 (patch) | |
| tree | f9d5efb2e0037e5b602f2be23120910c40b94919 /indra/newview/llappviewer.cpp | |
| parent | e0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (diff) | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
Merge with viewer-release
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 7706cd789f..5a68cd531e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1489,6 +1489,9 @@ void LLAppViewer::flushVFSIO() bool LLAppViewer::cleanup() { + //ditch LLVOAvatarSelf instance + gAgentAvatarp = NULL; + // workaround for DEV-35406 crash on shutdown LLEventPumps::instance().reset(); |