Revert "Updated lltexturecache to the latest in viewer-development (see #425)" since it was causing issues with local assets and object backup

This reverts commit 4ca4594ec264f390be981568ef5ff3ff0f2f77e6.

1 files changed, 8 insertions, 29 deletions

diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index f80be00..45804c2 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -40,7 +40,6 @@
 
 #include "llworkerthread.h"
 
-class LLImageFormatted;
 class LLTextureCacheWorker;
 
 class LLTextureCache : public LLWorkerThread
@@ -59,16 +58,10 @@ private:
         };
         struct Entry
         {
-                Entry() :
-                        mBodySize(0),
-                        mImageSize(0),
-                        mTime(0)
-                {
-                }
+                Entry() {}
                 Entry(const LLUUID& id, S32 imagesize, S32 bodysize, U32 time) :
                         mID(id), mImageSize(imagesize), mBodySize(bodysize), mTime(time) {}
                 void init(const LLUUID& id, U32 time) { mID = id, mImageSize = 0; mBodySize = 0; mTime = time; }
-                Entry& operator=(const Entry& entry) {mID = entry.mID, mImageSize = entry.mImageSize; mBodySize = entry.mBodySize; mTime = entry.mTime; return *this;}
                 LLUUID mID; // 16 bytes
                 S32 mImageSize; // total size of image if known
                 S32 mBodySize; // size of body file in body cache
@@ -110,8 +103,7 @@ public:
         /*virtual*/ S32 update(U32 max_time_ms);        
         
         void purgeCache(ELLPath location);
-        void setReadOnly(BOOL read_only) ;
-        S64 initCache(ELLPath location, S64 maxsize, BOOL disable_texture_cache);
+        S64 initCache(ELLPath location, S64 maxsize, BOOL read_only);
 
         handle_t readFromCache(const std::string& local_filename, const LLUUID& id, U32 priority, S32 offset, S32 size,
                                                    ReadResponder* responder);
@@ -124,7 +116,7 @@ public:
         bool writeComplete(handle_t handle, bool abort = false);
         void prioritizeWrite(handle_t handle);
 
-        bool removeFromCache(const LLUUID& id);
+        void removeFromCache(const LLUUID& id);
 
         // For LLTextureCacheWorker::Responder
         LLTextureCacheWorker* getReader(handle_t handle);
@@ -139,11 +131,10 @@ public:
         S64 getMaxUsage() { return sCacheMaxTexturesSize; }
         U32 getEntries() { return mHeaderEntriesInfo.mEntries; }
         U32 getMaxEntries() { return sCacheMaxEntries; };
-        BOOL isInCache(const LLUUID& id) ;
-        BOOL isInLocal(const LLUUID& id) ;
 
 protected:
         // Accessed by LLTextureCacheWorker
+        bool updateTextureEntryList(const LLUUID& id, S32 size);
         std::string getLocalFileName(const LLUUID& id);
         std::string getTextureFileName(const LLUUID& id);
         void addCompleted(Responder* responder, bool success);
@@ -154,7 +145,6 @@ protected:
 private:
         void setDirNames(ELLPath location);
         void readHeaderCache();
-        void clearCorruptedCache();
         void purgeAllTextures(bool purge_directories);
         void purgeTextures(bool validate);
         LLAPRFile* openHeaderEntriesFile(bool readonly, S32 offset);
@@ -162,20 +152,12 @@ private:
         void readEntriesHeader();
         void writeEntriesHeader();
         S32 openAndReadEntry(const LLUUID& id, Entry& entry, bool create);
-        bool updateEntry(S32& idx, Entry& entry, S32 new_image_size, S32 new_body_size);
-        void updateEntryTimeStamp(S32 idx, Entry& entry) ;
+        void writeEntryAndClose(S32 idx, Entry& entry);
         U32 openAndReadEntries(std::vector<Entry>& entries);
         void writeEntriesAndClose(const std::vector<Entry>& entries);
-        void readEntryFromHeaderImmediately(S32& idx, Entry& entry) ;
-        void writeEntryToHeaderImmediately(S32& idx, Entry& entry, bool write_header = false) ;
-        void removeEntry(S32 idx, Entry& entry, std::string& filename);
-        void removeCachedTexture(const LLUUID& id) ;
-        S32 getHeaderCacheEntry(const LLUUID& id, Entry& entry);
-        S32 setHeaderCacheEntry(const LLUUID& id, Entry& entry, S32 imagesize, S32 datasize);
-        void writeUpdatedEntries() ;
-        void updatedHeaderEntriesFile() ;
-        void lockHeaders() { mHeaderMutex.lock(); }
-        void unlockHeaders() { mHeaderMutex.unlock(); }
+        S32 getHeaderCacheEntry(const LLUUID& id, S32& imagesize);
+        S32 setHeaderCacheEntry(const LLUUID& id, S32 imagesize);
+        bool removeHeaderCacheEntry(const LLUUID& id);
         
 private:
         // Internal
@@ -212,9 +194,6 @@ private:
         S64 mTexturesSizeTotal;
         LLAtomic32<BOOL> mDoPurge;
 
-        typedef std::map<S32, Entry> idx_entry_map_t;
-        idx_entry_map_t mUpdatedEntryMap;
-
         // Statics
         static F32 sHeaderCacheVersion;
         static U32 sCacheMaxEntries;