summaryrefslogtreecommitdiff
path: root/indra/newview/llvocache.h
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-09-04 19:20:52 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-09-04 19:20:52 +0300
commit27d391b2bb068ee38ba36e7b3169058196da9420 (patch)
tree2c9a7e7ec92b57e3c2c2905f3ae3f09004452a99 /indra/newview/llvocache.h
parenta8bc48b334428ab0d809c93d3d70b8a84df6723e (diff)
SL-11868 Fix cache init after purge
Diffstat (limited to 'indra/newview/llvocache.h')
-rw-r--r--indra/newview/llvocache.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h
index 41b5246480..6c95541c11 100644
--- a/indra/newview/llvocache.h
+++ b/indra/newview/llvocache.h
@@ -223,7 +223,7 @@ private:
//
class LLVOCache : public LLParamSingleton<LLVOCache>
{
- LLSINGLETON(LLVOCache, ELLPath location, U32 size, U32 cache_version, bool read_only);
+ LLSINGLETON(LLVOCache, bool read_only);
~LLVOCache() ;
private:
@@ -259,6 +259,8 @@ private:
typedef std::map<U64, HeaderEntryInfo*> handle_entry_map_t;
public:
+ // We need this init to be separate from constructor, since we might construct cache, purge it, then init.
+ 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) ;
@@ -269,8 +271,6 @@ public:
U32 getCacheEntriesMax() { return mCacheSize; }
private:
- void initCache(ELLPath location, U32 size, U32 cache_version);
-
void setDirNames(ELLPath location);
// determine the cache filename for the region from the region handle
void getObjectCacheFilename(U64 handle, std::string& filename);