diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-04-09 18:11:34 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-04-09 18:11:34 -0400 |
| commit | af74e5e443934659e8a8a193980e6683e14e7fa1 (patch) | |
| tree | b26b8edae4aadcebdd029d9f76f384dc5fc7be94 /indra/newview/llappviewer.cpp | |
| parent | e4cced82343391292e61db03bb019e19827834c7 (diff) | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
merge viewer-release to runway
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 bea8303d69..98a83175a7 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1486,6 +1486,9 @@ void LLAppViewer::flushVFSIO() bool LLAppViewer::cleanup() { + //ditch LLVOAvatarSelf instance + gAgentAvatarp = NULL; + // workaround for DEV-35406 crash on shutdown LLEventPumps::instance().reset(); |