From 8c289ec126edf510a542c86e4c9df1787a37acb6 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Fri, 11 Sep 2020 10:00:17 -0700 Subject: Effective rename of DRTVWR-506-simple since there is no way to rename a branch. Cloned canonical viewer into DRTVWR-519, copied over the files that changed from DRTVWR-506-simple and pushed back. Once I am satisfied everything is correct, DRTVWR-506-simple will be removed --- indra/llvfs/llvfile.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'indra/llvfs/llvfile.h') diff --git a/indra/llvfs/llvfile.h b/indra/llvfs/llvfile.h index 7e9d9f73e5..4aeb9c9630 100644 --- a/indra/llvfs/llvfile.h +++ b/indra/llvfs/llvfile.h @@ -39,8 +39,8 @@ public: ~LLVFile(); BOOL read(U8 *buffer, S32 bytes, BOOL async = FALSE, F32 priority = 128.f); /* Flawfinder: ignore */ - static U8* readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S32* bytes_read = 0); - void setReadPriority(const F32 priority); + //CP static U8* readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S32* bytes_read = 0); + //CP void setReadPriority(const F32 priority); BOOL isReadComplete(); S32 getLastBytesRead(); BOOL eof(); @@ -61,12 +61,12 @@ public: static void initClass(LLVFSThread* vfsthread = NULL); static void cleanupClass(); - static LLVFSThread* getVFSThread() { return sVFSThread; } + //CP static LLVFSThread* getVFSThread() { return sVFSThread; } protected: - static LLVFSThread* sVFSThread; - static BOOL sAllocdVFSThread; - U32 threadPri() { return LLVFSThread::PRIORITY_NORMAL + llmin((U32)mPriority,(U32)0xfff); } + //CP static LLVFSThread* sVFSThread; + //CP static BOOL sAllocdVFSThread; + //CP U32 threadPri() { return LLVFSThread::PRIORITY_NORMAL + llmin((U32)mPriority,(U32)0xfff); } public: static const S32 READ; @@ -77,14 +77,15 @@ public: protected: LLAssetType::EType mFileType; + BOOL mReadComplete; LLUUID mFileID; S32 mPosition; S32 mMode; - LLVFS *mVFS; - F32 mPriority; + //CP LLVFS *mVFS; + //CP F32 mPriority; S32 mBytesRead; - LLVFSThread::handle_t mHandle; + //CP LLVFSThread::handle_t mHandle; }; #endif -- cgit v1.2.3 From 060dd2aeab72df26d6375f2e0fad619113fe7e13 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 16 Sep 2020 19:03:48 +0300 Subject: Check existence of local files instead of checking VFS --- indra/llvfs/llvfile.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llvfs/llvfile.h') diff --git a/indra/llvfs/llvfile.h b/indra/llvfs/llvfile.h index 4aeb9c9630..71dd273404 100644 --- a/indra/llvfs/llvfile.h +++ b/indra/llvfs/llvfile.h @@ -58,6 +58,8 @@ public: bool isLocked(EVFSLock lock); void waitForLock(EVFSLock lock); + + static bool getExists(const LLUUID &file_id, const LLAssetType::EType file_type); static void initClass(LLVFSThread* vfsthread = NULL); static void cleanupClass(); -- cgit v1.2.3 From 3fc07dea01795b31c37dcd093ec73d190a1e188a Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 16 Sep 2020 18:53:24 -0700 Subject: First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. --- indra/llvfs/llvfile.h | 93 --------------------------------------------------- 1 file changed, 93 deletions(-) delete mode 100644 indra/llvfs/llvfile.h (limited to 'indra/llvfs/llvfile.h') diff --git a/indra/llvfs/llvfile.h b/indra/llvfs/llvfile.h deleted file mode 100644 index 71dd273404..0000000000 --- a/indra/llvfs/llvfile.h +++ /dev/null @@ -1,93 +0,0 @@ -/** - * @file llvfile.h - * @brief Definition of virtual file - * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLVFILE_H -#define LL_LLVFILE_H - -#include "lluuid.h" -#include "llassettype.h" -#include "llvfs.h" -#include "llvfsthread.h" - -class LLVFile -{ -public: - LLVFile(LLVFS *vfs, const LLUUID &file_id, const LLAssetType::EType file_type, S32 mode = LLVFile::READ); - ~LLVFile(); - - BOOL read(U8 *buffer, S32 bytes, BOOL async = FALSE, F32 priority = 128.f); /* Flawfinder: ignore */ - //CP static U8* readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S32* bytes_read = 0); - //CP void setReadPriority(const F32 priority); - BOOL isReadComplete(); - S32 getLastBytesRead(); - BOOL eof(); - - BOOL write(const U8 *buffer, S32 bytes); - static BOOL writeFile(const U8 *buffer, S32 bytes, LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type); - BOOL seek(S32 offset, S32 origin = -1); - S32 tell() const; - - S32 getSize(); - S32 getMaxSize(); - BOOL setMaxSize(S32 size); - BOOL rename(const LLUUID &new_id, const LLAssetType::EType new_type); - BOOL remove(); - - bool isLocked(EVFSLock lock); - void waitForLock(EVFSLock lock); - - static bool getExists(const LLUUID &file_id, const LLAssetType::EType file_type); - - static void initClass(LLVFSThread* vfsthread = NULL); - static void cleanupClass(); - //CP static LLVFSThread* getVFSThread() { return sVFSThread; } - -protected: - //CP static LLVFSThread* sVFSThread; - //CP static BOOL sAllocdVFSThread; - //CP U32 threadPri() { return LLVFSThread::PRIORITY_NORMAL + llmin((U32)mPriority,(U32)0xfff); } - -public: - static const S32 READ; - static const S32 WRITE; - static const S32 READ_WRITE; - static const S32 APPEND; - -protected: - LLAssetType::EType mFileType; - - BOOL mReadComplete; - LLUUID mFileID; - S32 mPosition; - S32 mMode; - //CP LLVFS *mVFS; - //CP F32 mPriority; - - S32 mBytesRead; - //CP LLVFSThread::handle_t mHandle; -}; - -#endif -- cgit v1.2.3