diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-11 16:52:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-11 16:52:00 -0400 |
| commit | 44c7c6feaa824f4049d326965cb066e76ebefee3 (patch) | |
| tree | 71a8a35701a486b44b969d14306aad8953fa8286 /indra/newview/llappviewer.cpp | |
| parent | 121d004b324c976acc6ac4f94f6dbe2ae54040eb (diff) | |
| parent | 57c30517817a6458edab6bfdfad7d7112467ca48 (diff) | |
merge changes for storm-1315
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 1d9519d675..80ac385e3b 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" @@ -1543,7 +1544,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) |