diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lltexturecache.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h index 22d27b0..68b1458 100644 --- a/linden/indra/newview/lltexturecache.h +++ b/linden/indra/newview/lltexturecache.h | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -108,18 +109,17 @@ public: | |||
108 | 109 | ||
109 | protected: | 110 | protected: |
110 | // Accessed by LLTextureCacheWorker | 111 | // Accessed by LLTextureCacheWorker |
111 | apr_pool_t* getFileAPRPool() { return mFileAPRPool; } | ||
112 | bool appendToTextureEntryList(const LLUUID& id, S32 size); | 112 | bool appendToTextureEntryList(const LLUUID& id, S32 size); |
113 | std::string getLocalFileName(const LLUUID& id); | 113 | std::string getLocalFileName(const LLUUID& id); |
114 | std::string getTextureFileName(const LLUUID& id); | 114 | std::string getTextureFileName(const LLUUID& id); |
115 | void addCompleted(Responder* responder, bool success); | 115 | void addCompleted(Responder* responder, bool success); |
116 | 116 | ||
117 | protected: | 117 | protected: |
118 | void setFileAPRPool(apr_pool_t* pool) { mFileAPRPool = pool ; } | 118 | //void setFileAPRPool(apr_pool_t* pool) { mFileAPRPool = pool ; } |
119 | 119 | ||
120 | private: | 120 | private: |
121 | void setDirNames(ELLPath location); | 121 | void setDirNames(ELLPath location); |
122 | void readHeaderCache(apr_pool_t* poolp = NULL); | 122 | void readHeaderCache(); |
123 | void purgeAllTextures(bool purge_directories); | 123 | void purgeAllTextures(bool purge_directories); |
124 | void purgeTextures(bool validate); | 124 | void purgeTextures(bool validate); |
125 | S32 getHeaderCacheEntry(const LLUUID& id, bool touch, S32* imagesize = NULL); | 125 | S32 getHeaderCacheEntry(const LLUUID& id, bool touch, S32* imagesize = NULL); |
@@ -132,7 +132,6 @@ private: | |||
132 | LLMutex mWorkersMutex; | 132 | LLMutex mWorkersMutex; |
133 | LLMutex mHeaderMutex; | 133 | LLMutex mHeaderMutex; |
134 | LLMutex mListMutex; | 134 | LLMutex mListMutex; |
135 | apr_pool_t* mFileAPRPool; | ||
136 | 135 | ||
137 | typedef std::map<handle_t, LLTextureCacheWorker*> handle_map_t; | 136 | typedef std::map<handle_t, LLTextureCacheWorker*> handle_map_t; |
138 | handle_map_t mReaders; | 137 | handle_map_t mReaders; |