summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-08-30 14:12:52 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-08-30 14:12:52 -0400
commit57ecedb469ef915d263c2cad31da724548df4285 (patch)
tree7df71403aa3fe53dd81bd9163e58596e292d2250 /indra/newview
parent82e71849a9975acbc27e7816c6f3430a693eccd4 (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/newview')
-rw-r--r--indra/newview/llappviewer.cpp9
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();