summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorCallum Prentice <callum@gmail.com>2020-09-24 14:45:39 -0700
committerCallum Prentice <callum@gmail.com>2020-09-24 14:45:39 -0700
commit6be1f88a5ef99e1e40bb5701a250ba0728f56005 (patch)
treea6d12f9b2f25b4b295999e6f18df422096aa25ca /indra/llcharacter
parent96e2873bfa2c6b8823aed3b4190c43cd5dab54e6 (diff)
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
Diffstat (limited to 'indra/llcharacter')
-rw-r--r--indra/llcharacter/llkeyframemotion.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index d1ac336fc1..fe9de30f0a 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -39,9 +39,9 @@
#include "llendianswizzle.h"
#include "llkeyframemotion.h"
#include "llquantize.h"
-#include "lldiskcache.h"
#include "m3math.h"
#include "message.h"
+#include "llfilesystem.h"
//-----------------------------------------------------------------------------
// Static Definitions
@@ -559,7 +559,7 @@ LLMotion::LLMotionInitStatus LLKeyframeMotion::onInitialize(LLCharacter *charact
S32 anim_file_size;
BOOL success = FALSE;
- LLDiskCache* anim_file = new LLDiskCache(mID, LLAssetType::AT_ANIMATION);
+ LLFileSystem* anim_file = new LLFileSystem(mID, LLAssetType::AT_ANIMATION);
if (!anim_file || !anim_file->getSize())
{
delete anim_file;
@@ -2324,7 +2324,7 @@ void LLKeyframeMotion::onLoadComplete(const LLUUID& asset_uuid,
// asset already loaded
return;
}
- LLDiskCache file(asset_uuid, type, LLDiskCache::READ);
+ LLFileSystem file(asset_uuid, type, LLFileSystem::READ);
S32 size = file.getSize();
U8* buffer = new U8[size];