summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-11-14 22:04:37 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-11-14 22:04:37 +0200
commit7fceb3a63f0157c7075c77e6d8516079ff4d217a (patch)
tree19f23fe6dc1c2d396de32b32608352091ebda332 /indra/newview/llstartup.cpp
parent6c7fabdec76eda60fa27640d115e06e2bbfc12e4 (diff)
parentc52f621e20737b553a9a9e7f1c961f5d5fbc6f89 (diff)
Merged in lindenlab/viewer-cleanup
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 4e81d78455..1bc20ccf12 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -193,6 +193,7 @@
#include "llstartuplistener.h"
#include "lltoolbarview.h"
#include "llexperiencelog.h"
+#include "llcleanup.h"
#if LL_WINDOWS
#include "lldxhardware.h"
@@ -2808,7 +2809,7 @@ void LLStartUp::initExperiences()
void LLStartUp::cleanupNameCache()
{
- LLAvatarNameCache::cleanupClass();
+ SUBSYSTEM_CLEANUP(LLAvatarNameCache);
delete gCacheName;
gCacheName = NULL;