diff options
| author | prep <none@none> | 2012-03-02 11:29:30 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-03-02 11:29:30 -0500 |
| commit | f5cebb27a72cf31723eb621bdcd117f7634a4e58 (patch) | |
| tree | 656bda206f1467c61d37acee3440020281440b06 /indra/newview/llappviewer.cpp | |
| parent | c2a7006413ea5e4a0bf7b8b75fe5afdb51e9a6e5 (diff) | |
| parent | e1e13bcab96565ddc7627139673519a09a60962f (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 261553599b..c1217fc402 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1488,6 +1488,9 @@ void LLAppViewer::flushVFSIO() bool LLAppViewer::cleanup() { + //ditch LLVOAvatarSelf instance + gAgentAvatarp = NULL; + // workaround for DEV-35406 crash on shutdown LLEventPumps::instance().reset(); |