diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-04 13:51:16 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-04 13:51:16 -0400 |
commit | 07ec10781e45b3d92e27e92ddad39cf74fa7ff0b (patch) | |
tree | c5df107f638de079ff537d0b1b82befc294e7997 /indra/newview/llappviewer.cpp | |
parent | 35cec8fec8fef36a75bbb168e38c235ff0c47b49 (diff) | |
parent | b94e2d0103168f143ee7579f01f0d45fc63a4e84 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 850f7b1c31..a26ee2204b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2114,13 +2114,6 @@ bool LLAppViewer::cleanup() // This calls every remaining LLSingleton's deleteSingleton() method. // No class destructor should perform any cleanup that might take // significant realtime, or throw an exception. - // LLSingleton machinery includes a last-gasp implicit deleteAll() call, - // so this explicit call shouldn't strictly be necessary. However, by the - // time the runtime engages that implicit call, it may already have - // destroyed things like std::cerr -- so the implicit deleteAll() refrains - // from logging anything. Since both cleanupAll() and deleteAll() call - // their respective cleanup methods in computed dependency order, it's - // probably useful to be able to log that order. LLSingletonBase::deleteAll(); removeDumpDir(); |