diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:27:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:27:34 -0400 |
| commit | e6239b7978fb9f05d2c8c7cf42b9277f4a5f7c52 (patch) | |
| tree | 17080b4ffa8a59a5b9c158edaf9e60f9af2a67b4 /indra/newview/llappviewer.cpp | |
| parent | 66cac05cfb1236c3c1607dff27babf873c29a679 (diff) | |
| parent | 6484dbf28cb8b6ffa745fe9b26beae58d3c68441 (diff) | |
merge changes for storm-1571
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d12b971bde..9b29d69cce 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -137,6 +137,7 @@ #include "lltoolmgr.h" #include "llassetstorage.h" #include "llpolymesh.h" +#include "llproxy.h" #include "llaudioengine.h" #include "llstreamingaudio.h" #include "llviewermenu.h" @@ -1840,6 +1841,8 @@ bool LLAppViewer::cleanup() LLWeb::loadURLExternal( gLaunchFileOnQuit, false ); llinfos << "File launched." << llendflush; } + llinfos << "Cleaning up LLProxy." << llendl; + LLProxy::cleanupClass(); LLMainLoopRepeater::instance().stop(); |