summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.h
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-08-19 18:51:21 -0400
committerMonty Brandenberg <monty@lindenlab.com>2012-08-19 18:51:21 -0400
commit4b86f8983ad343b675e3f4960e91f0d4cb876dea (patch)
treed48fa2043f0c10afdba55de79d554a66ac488fc1 /indra/newview/lltexturefetch.h
parentd06739facfc13f5e7081783f85c1dd3576c3c155 (diff)
SH-3329 Cached scene loads slower than same scene with cleared cache.
A/B comparison with original code showed the newer issuing lower-priority requests of the cache reader and some other minor changes. Brought them into agreement (this is cargo-cult programming). Made the HTTP resource semaphore an atomic int for rigorous correctness across threads. I swear I'm going to tear down this code someday.
Diffstat (limited to 'indra/newview/lltexturefetch.h')
-rw-r--r--indra/newview/lltexturefetch.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index 95ec8c65c0..4294209f04 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -355,10 +355,10 @@ private:
// where it's more expensive to get at them. Requests in either
// SEND_HTTP_REQ or WAIT_HTTP_REQ charge against the semaphore
// and tracking state transitions is critical to liveness.
- int mHttpSemaphore; // Ttf
+ LLAtomicS32 mHttpSemaphore; // Ttf + Tmain
typedef std::set<LLUUID> wait_http_res_queue_t;
- wait_http_res_queue_t mHttpWaitResource; // Mfnq
+ wait_http_res_queue_t mHttpWaitResource; // Mfnq
// Cumulative stats on the states/requests issued by
// textures running through here.