summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorAaron Stone <stone@lindenlab.com>2011-07-12 15:52:14 -0700
committerAaron Stone <stone@lindenlab.com>2011-07-12 15:52:14 -0700
commit450b64981c878f558b597a2855bc18318555a532 (patch)
treed84598caf68980baa4eb3f058ada5b3ffb1c4dff /indra/newview/llappviewer.cpp
parent42daa3497b6626cbb5f32ba54162558cd025069b (diff)
parent44c7c6feaa824f4049d326965cb066e76ebefee3 (diff)
Merge for STORM-1482
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 1ce92c689d..6763881094 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -56,6 +56,7 @@
#include "llallocator.h"
#include "llares.h"
#include "llcurl.h"
+#include "llcalc.h"
#include "lltexturestats.h"
#include "lltexturestats.h"
#include "llviewerwindow.h"
@@ -1518,7 +1519,9 @@ bool LLAppViewer::cleanup()
// Note: this is where gLocalSpeakerMgr and gActiveSpeakerMgr used to be deleted.
LLWorldMap::getInstance()->reset(); // release any images
-
+
+ LLCalc::cleanUp();
+
llinfos << "Global stuff deleted" << llendflush;
if (gAudiop)