From 695e4bc17126baa282c7f27e8ac9ef1c3323fa77 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 19 Apr 2010 10:00:06 -0400 Subject: For EXT-6809 - search static VFS for all asset types --- indra/llmessage/llassetstorage.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/llmessage') diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp index e65a488098..f8b929769d 100644 --- a/indra/llmessage/llassetstorage.cpp +++ b/indra/llmessage/llassetstorage.cpp @@ -418,8 +418,8 @@ bool LLAssetStorage::findInVFSAndInvokeCallback(LLVFS *vfs, const LLUUID& uuid, if (callback) { callback(vfs, uuid, type, user_data, LL_ERR_NOERR, LL_EXSTAT_VFS_CACHED); - return true; } + return true; } else { @@ -454,6 +454,7 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, LL return; } + // Try static VFS first. if (findInVFSAndInvokeCallback(mStaticVFS,uuid,type,callback,user_data)) { return; @@ -652,6 +653,7 @@ void LLAssetStorage::getEstateAsset(const LLHost &object_sim, const LLUUID &agen return; } + // Try static VFS first. if (findInVFSAndInvokeCallback(mStaticVFS,asset_id,atype,callback,user_data)) { return; -- cgit v1.2.3