diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-26 15:27:34 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-26 15:27:34 -0400 |
| commit | 3f52cefcc4b4cc00caef56a40e0da1ea981a3073 (patch) | |
| tree | 7697fdea468261e1cd266eed1ba37ecab08c1e16 /indra/newview/llstartup.cpp | |
| parent | 33c88a1c6037290924691db59c6538a370946ea4 (diff) | |
| parent | 687efd84eabc524e339e61458b0cbf53f9a38f8a (diff) | |
MAINT-5232: merge LLError::Log::demangle() to tip
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 42fc300187..3a85468bda 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -194,6 +194,7 @@ #include "llevents.h" #include "llstartuplistener.h" #include "lltoolbarview.h" +#include "llcleanup.h" #if LL_WINDOWS #include "lldxhardware.h" @@ -2826,7 +2827,7 @@ void LLStartUp::initNameCache() void LLStartUp::cleanupNameCache() { - LLAvatarNameCache::cleanupClass(); + SUBSYSTEM_CLEANUP(LLAvatarNameCache); delete gCacheName; gCacheName = NULL; |