From ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 30 Apr 2009 13:04:20 -0500 Subject: Second Life viewer sources 1.23.0-RC --- linden/indra/newview/lltexturecache.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'linden/indra/newview/lltexturecache.h') 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 @@ * There are special exceptions to the terms and conditions of the GPL as * it is applied to this Source Code. View the full text of the exception * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception * * By copying, modifying or distributing this software, you acknowledge * that you have read and understood your obligations described above, @@ -108,18 +109,17 @@ public: protected: // Accessed by LLTextureCacheWorker - apr_pool_t* getFileAPRPool() { return mFileAPRPool; } bool appendToTextureEntryList(const LLUUID& id, S32 size); std::string getLocalFileName(const LLUUID& id); std::string getTextureFileName(const LLUUID& id); void addCompleted(Responder* responder, bool success); protected: - void setFileAPRPool(apr_pool_t* pool) { mFileAPRPool = pool ; } + //void setFileAPRPool(apr_pool_t* pool) { mFileAPRPool = pool ; } private: void setDirNames(ELLPath location); - void readHeaderCache(apr_pool_t* poolp = NULL); + void readHeaderCache(); void purgeAllTextures(bool purge_directories); void purgeTextures(bool validate); S32 getHeaderCacheEntry(const LLUUID& id, bool touch, S32* imagesize = NULL); @@ -132,7 +132,6 @@ private: LLMutex mWorkersMutex; LLMutex mHeaderMutex; LLMutex mListMutex; - apr_pool_t* mFileAPRPool; typedef std::map handle_map_t; handle_map_t mReaders; -- cgit v1.1