summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-08-03 18:26:47 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-08-03 18:26:47 -0600
commitd4d50221e0c06ad5f7f086b095551459dcfeb9f8 (patch)
treec298e4a1bbba82ba9112ee261c94e3ba9808cc3d /indra/newview/lltexturefetch.h
parent5416c10cbb06acbf211002e4d9e210fbe41d2764 (diff)
fix for EXT-7399: 2.0.2 with http textures loads textures slower than 1.23.5
and EXT-7397: decoding textures get stuck in REQ status
Diffstat (limited to 'indra/newview/lltexturefetch.h')
-rw-r--r--indra/newview/lltexturefetch.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index 634e590fe0..bae2ceff72 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,15 @@ private:
F32 mTextureBandwidth;
F32 mMaxBandwidth;
LLTextureInfo mTextureInfo;
+
+ enum
+ {
+ SMALL_TEXTURE = 0 , //size <= 64 * 64
+ MEDIUM_TEXTURE, //size <= 256 * 256
+ LARGE_TEXTURE, //size > 256 * 256
+ TOTAL_TEXTURE_TYPES
+ };
+ BOOL mHTTPThrottleFlag[TOTAL_TEXTURE_TYPES];
};
#endif // LL_LLTEXTUREFETCH_H