diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-08-04 12:52:06 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-08-04 12:52:06 -0700 |
| commit | b4b503d4ac3fb43aea61a9c0b7adb0ae50b096ab (patch) | |
| tree | 987739481f5baf68605705c3cfba3e1e8ff6bf19 /indra/newview/lltexturefetch.h | |
| parent | b3fd508cff74da6b8620dc440482e41fabc9337a (diff) | |
| parent | aaa41211c83a9dcc9ff3db84c7e4b9de985be692 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lltexturefetch.h')
| -rw-r--r-- | indra/newview/lltexturefetch.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h index 634e590fe0..c31c38b04a 100644 --- a/indra/newview/lltexturefetch.h +++ b/indra/newview/lltexturefetch.h @@ -95,7 +95,8 @@ protected: void removeFromNetworkQueue(LLTextureFetchWorker* worker, bool cancel); void addToHTTPQueue(const LLUUID& id); void removeFromHTTPQueue(const LLUUID& id); - S32 getHTTPQueueSize() { return getNumHTTPRequests(); } + bool isHTTPThrottled(S32 requested_size); + void clearHTTPThrottleFlag(); void removeRequest(LLTextureFetchWorker* worker, bool cancel); // Called from worker thread (during doWork) void processCurlRequests(); @@ -134,6 +135,16 @@ private: F32 mTextureBandwidth; F32 mMaxBandwidth; LLTextureInfo mTextureInfo; + + enum + { + SMALL_TEXTURE = 0 , //size <= 64 * 64 + MEDIUM_TEXTURE, //size <= 256 * 256 + LARGE_TEXTURE, //size > 256 * 256 + DUMMY, + TOTAL_TEXTURE_TYPES + }; + BOOL mHTTPThrottleFlag[TOTAL_TEXTURE_TYPES]; }; #endif // LL_LLTEXTUREFETCH_H |