Fix/Finish VoCache extras

The extras cache was never fully implemented and thus grows forever.
This coupled with the server side "bug" that sends innumerable blank overrides leads users to collect 100MB+ SLEC files which in turn cause significant pauses post TP.

1 files changed, 3 insertions, 8 deletions

diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h
index 8525edd121..c24a4accc7 100644
--- a/indra/newview/llvocache.h
+++ b/indra/newview/llvocache.h
@@ -96,12 +96,6 @@ public:
 		}
 	};
 
-    struct ExtrasEntry
-    {
-        LLSD extras;
-        std::string extras_raw;
-    };
-
 protected:
 	~LLVOCacheEntry();
 public:
@@ -289,12 +283,13 @@ public:
 	void initCache(ELLPath location, U32 size, U32 cache_version);
 	void removeCache(ELLPath location, bool started = false) ;
 
-	void readFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::vocache_entry_map_t& cache_entry_map) ;
-    void readGenericExtrasFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::vocache_gltf_overrides_map_t& cache_extras_entry_map);
+	bool readFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::vocache_entry_map_t& cache_entry_map) ;
+	void readGenericExtrasFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::vocache_gltf_overrides_map_t& cache_extras_entry_map, const LLVOCacheEntry::vocache_entry_map_t& cache_entry_map);
 
 	void writeToCache(U64 handle, const LLUUID& id, const LLVOCacheEntry::vocache_entry_map_t& cache_entry_map, BOOL dirty_cache, bool removal_enabled);
     void writeGenericExtrasToCache(U64 handle, const LLUUID& id, const LLVOCacheEntry::vocache_gltf_overrides_map_t& cache_extras_entry_map, BOOL dirty_cache, bool removal_enabled);
 	void removeEntry(U64 handle) ;
+	void removeGenericExtrasForHandle(U64 handle);
 
 	U32 getCacheEntries() { return mNumEntries; }
 	U32 getCacheEntriesMax() { return mCacheSize; }