diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-08-30 14:12:52 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-08-30 14:12:52 -0400 |
commit | 57ecedb469ef915d263c2cad31da724548df4285 (patch) | |
tree | 7df71403aa3fe53dd81bd9163e58596e292d2250 /indra | |
parent | 82e71849a9975acbc27e7816c6f3430a693eccd4 (diff) |
MAINT-5232: Change getIfExists() call to instanceExists().
LLSingleton::getIfExists() has been eliminated. The only remaining way to
detect whether a given LLSingleton has been instantiated is to call
instanceExists(). But the relevant cleanup code should be refactored to
cleanupSingleton() anyway, which would make this specific call moot.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llappviewer.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 11f76fd030..fad9feee06 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -5481,9 +5481,12 @@ void LLAppViewer::disconnectViewer() } saveNameCache(); - LLExperienceCache *expCache = LLExperienceCache::getIfExists(); - if (expCache) - expCache->cleanup(); + if (LLExperienceCache::instanceExists()) + { + // TODO: LLExperienceCache::cleanup() logic should be moved to + // cleanupSingleton(). + LLExperienceCache::instance().cleanup(); + } // close inventory interface, close all windows LLFloaterInventory::cleanup(); |