diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:27:21 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:34:16 -0700 |
| commit | 303feae305eb526d75b7d9c8b640407cb8003469 (patch) | |
| tree | 0e322ed210d9600530f0d916fbb18f8330e6aee7 /indra/llaudio/llaudioengine.cpp | |
| parent | 9fdd1582774a928242b7fec91bbd951b123296e8 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' v6.4.17 into DRTVWR-525
Diffstat (limited to 'indra/llaudio/llaudioengine.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index d35f249973..1d447f32ae 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -35,7 +35,7 @@ #include "sound_ids.h" // temporary hack for min/max distances -#include "llfilesystem.h" +#include "llvfs.h" #include "lldir.h" #include "llaudiodecodemgr.h" #include "llassetstorage.h" @@ -684,9 +684,13 @@ bool LLAudioEngine::preloadSound(const LLUUID &uuid) return true; } + // At some point we need to have the audio/asset system check the static VFS + // before it goes off and fetches stuff from the server. + //LL_WARNS() << "Used internal preload for non-local sound" << LL_ENDL; return false; } + bool LLAudioEngine::isWindEnabled() { return mEnableWind; @@ -1014,12 +1018,13 @@ bool LLAudioEngine::hasDecodedFile(const LLUUID &uuid) bool LLAudioEngine::hasLocalFile(const LLUUID &uuid) { - // See if it's in the cache. - bool have_local = LLFileSystem::getExists(uuid, LLAssetType::AT_SOUND); - LL_DEBUGS("AudioEngine") << "sound uuid " << uuid << " exists in cache" << LL_ENDL; + // See if it's in the VFS. + bool have_local = gVFS->getExists(uuid, LLAssetType::AT_SOUND); + LL_DEBUGS("AudioEngine") << "sound uuid "<<uuid<<" exists in VFS"<<LL_ENDL; return have_local; } + void LLAudioEngine::startNextTransfer() { //LL_INFOS() << "LLAudioEngine::startNextTransfer()" << LL_ENDL; @@ -1220,7 +1225,7 @@ void LLAudioEngine::startNextTransfer() // static -void LLAudioEngine::assetCallback(const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status) +void LLAudioEngine::assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status) { if (!gAudiop) { |