diff options
| author | Richard Linden <none@none> | 2012-09-06 11:47:48 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-09-06 11:47:48 -0700 |
| commit | 371b66a6ef7eb2568e3127c1c59326bce6e26ab8 (patch) | |
| tree | 9154fa799fc37df8cb493f921b41ad79596e903c /indra/newview/lltexturefetch.h | |
| parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) | |
| parent | 2cdfb170216c798c637081b0e28ec8921f0b777b (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/lltexturefetch.h')
| -rw-r--r-- | indra/newview/lltexturefetch.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h index f5072a79f1..7ffa58660e 100644 --- a/indra/newview/lltexturefetch.h +++ b/indra/newview/lltexturefetch.h @@ -35,6 +35,7 @@ #include "lltextureinfo.h" #include "llapr.h" #include "llimageworker.h" +#include "llstat.h" //#include "lltexturecache.h" class LLViewerTexture; @@ -171,7 +172,7 @@ private: LLTextureCache* mTextureCache; LLImageDecodeThread* mImageDecodeThread; LLCurlTextureRequest* mCurlGetRequest; - + // Map of all requests by UUID typedef std::map<LLUUID,LLTextureFetchWorker*> map_t; map_t mRequestMap; @@ -221,7 +222,7 @@ private: //debug use LLTextureFetchDebugger* mFetchDebugger; bool mFetcherLocked; - + e_tex_source mFetchSource; e_tex_source mOriginFetchSource; @@ -361,11 +362,11 @@ public: void setCurlGetRequest(LLCurlTextureRequest* request) { mCurlGetRequest = request;} LLCurlTextureRequest* getCurlGetRequest() { return mCurlGetRequest;} - + void startWork(e_debug_state state); void setStopDebug() {mStopDebug = TRUE;} void tryToStopDebug(); //stop everything - + void callbackCacheRead(S32 id, bool success, LLImageFormatted* image, S32 imagesize, BOOL islocal); void callbackCacheWrite(S32 id, bool success); |