diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-30 14:50:37 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-30 14:50:37 -0400 |
| commit | 77da469d6f7901ee0cddf5fb351cd2a756b217f0 (patch) | |
| tree | e0d7326fc438f7b579e3ddbcbb4772afa5402d23 /indra/newview/llstartup.cpp | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
| parent | d4fb82c217bccda536f7a7b2ca1809bb8c2dba40 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index d7bfd22cc9..bcdd078751 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -196,6 +196,7 @@ #include "llstartuplistener.h" #include "lltoolbarview.h" #include "llexperiencelog.h" +#include "llcleanup.h" #if LL_WINDOWS #include "lldxhardware.h" @@ -2839,7 +2840,7 @@ void LLStartUp::initExperiences() void LLStartUp::cleanupNameCache() { - LLAvatarNameCache::cleanupClass(); + SUBSYSTEM_CLEANUP(LLAvatarNameCache); delete gCacheName; gCacheName = NULL; |