diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-14 20:28:07 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-14 20:28:07 +0000 |
| commit | 7475ec05fc81e358a6979f3e9d7050ab91511c57 (patch) | |
| tree | 6f8f3f6f02cf41e45827c37fb9a3970780851865 /indra/newview/llappviewer.cpp | |
| parent | fd312d1929de708e5765cf1b3815cb61752fc355 (diff) | |
merge -r 2005-2011 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
* Bugs: EXT-1472 EXT-996
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 785179f7b3..c673db2034 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -179,6 +179,7 @@ #include "llimview.h" #include "llviewerthrottle.h" #include "llparcel.h" +#include "llavatariconctrl.h" // *FIX: These extern globals should be cleaned up. // The globals either represent state/config/resource-storage of either @@ -1467,6 +1468,9 @@ bool LLAppViewer::cleanup() sImageDecodeThread = NULL; LLLocationHistory::getInstance()->save(); + + LLAvatarIconIDCache::getInstance()->save(); + delete mFastTimerLogThread; mFastTimerLogThread = NULL; |