diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
| commit | c93c38e047836e31dd34e33391a997d883777ae1 (patch) | |
| tree | ccb52c02f9a3bfeb76254e128abc250e7fd5a962 /indra/newview/lltexturecache.h | |
| parent | fceae96eb171be0396512e251aab311d4e3ef9cc (diff) | |
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/lltexturecache.h')
| -rw-r--r-- | indra/newview/lltexturecache.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h index f9eb8cb177..f0f2ef47a8 100644 --- a/indra/newview/lltexturecache.h +++ b/indra/newview/lltexturecache.h @@ -84,6 +84,7 @@ protected: 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); private: void setDirNames(ELLPath location); @@ -99,12 +100,18 @@ private: // Internal LLMutex mWorkersMutex; LLMutex mHeaderMutex; + LLMutex mListMutex; apr_pool_t* mFileAPRPool; typedef std::map<handle_t, LLTextureCacheWorker*> handle_map_t; handle_map_t mReaders; handle_map_t mWriters; - std::vector<handle_t> mPrioritizeWriteList; + + typedef std::vector<handle_t> handle_list_t; + handle_list_t mPrioritizeWriteList; + + typedef std::vector<std::pair<LLPointer<Responder>, bool> > responder_list_t; + responder_list_t mCompletedList; BOOL mReadOnly; |