diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-27 15:11:19 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-27 15:11:19 -0500 |
| commit | de468db614a26ba1d8706a3448cf840d938a8d5b (patch) | |
| tree | 09eca006a7ecd148cd80d4fb6216893b5f636a6b /indra/newview/llappviewer.cpp | |
| parent | f304b18a74c8d3ae92d2298845e1c9f4f248e11a (diff) | |
| parent | f19a77047d10eca2bff07891375b7859b9e68e99 (diff) | |
Automated merge with https://bitbucket.org/stinson_linden/viewer-development-havokai
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index a455d359bf..85e6cd3d3f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -106,6 +106,7 @@ #include "llvfsthread.h" #include "llvolumemgr.h" #include "llxfermanager.h" +#include "llphysicsextensions.h" #include "llnotificationmanager.h" #include "llnotifications.h" @@ -1543,6 +1544,9 @@ bool LLAppViewer::cleanup() // shut down mesh streamer gMeshRepo.shutdown(); + // shut down Havok + LLPhysicsExtensions::quitSystem(); + // Must clean up texture references before viewer window is destroyed. if(LLHUDManager::instanceExists()) { |