diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-18 22:23:30 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-18 22:23:30 -0400 |
commit | d7400ae60c0453e111357abfb09d8308adf8b721 (patch) | |
tree | cfbbc175c4df5d0929ad923c5c52489b8d87fb75 /indra/newview/llappviewer.cpp | |
parent | d500379cea865e4a6958eee82b5615ace61036c4 (diff) | |
parent | 9cac312f57391792e9fce380c2c38ae4060ae1d7 (diff) |
merge to pathfinding development branch
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 8e9e3d8ad8..b297ce820a 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" @@ -1548,6 +1549,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()) { |