diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-09-01 16:15:36 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-09-01 16:15:36 -0700 |
| commit | d7672d80cf6c92f1720f8e7596c705bedcbd4a0f (patch) | |
| tree | 2a4c332f6c476dff900baed36af879700254fbe0 /indra/newview/llstartup.cpp | |
| parent | 02c3262ac8e7f27b0effb546ad235e103c9581cf (diff) | |
| parent | 96e343b49b0b5a0951ffab0beb2e1d09c37bbdc5 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index c74890a4e9..361cc6c48b 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2820,9 +2820,11 @@ void LLStartUp::initNameCache() void LLStartUp::initExperiences() -{ - LLAppViewer::instance()->loadExperienceCache(); - LLExperienceCache::initClass(); +{ + // Should trigger loading the cache. + LLExperienceCache::getInstance()->setCapabilityQuery( + boost::bind(&LLAgent::getRegionCapability, &gAgent, _1)); + LLExperienceLog::instance().initialize(); } |