Merge branch 'nicholaz-patches' into next

1 files changed, 5 insertions, 0 deletions

diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index 4bac15c..b5abb67 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -122,6 +122,7 @@ private:
         void readHeaderCache(apr_pool_t* poolp = NULL);
         void purgeAllTextures(bool purge_directories);
         void purgeTextures(bool validate);
+        void purgeTextureFilesTimeSliced(BOOL force_all = FALSE);
         S32 getHeaderCacheEntry(const LLUUID& id, bool touch, S32* imagesize = NULL);
         bool removeHeaderCacheEntry(const LLUUID& id);
         void lockHeaders() { mHeaderMutex.lock(); }
@@ -143,6 +144,10 @@ private:
 
         typedef std::vector<std::pair<LLPointer<Responder>, bool> > responder_list_t;
         responder_list_t mCompletedList;
+
+        typedef std::list<std::string> filename_list_t;
+        filename_list_t mFilesToDelete;
+        LLTimer mTimeLastFileDelete;
         
         BOOL mReadOnly;