From 562d343c47570731664b34507359c823cfcbd634 Mon Sep 17 00:00:00 2001 From: Steve Bennetts Date: Wed, 9 Dec 2009 18:18:01 -0800 Subject: EXT-3298 world map does not load simulator textures Forgot to add LLCurl update call to non threaded LLTextureFetch update. --- indra/newview/lltexturefetch.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/newview/lltexturefetch.cpp') diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index ef49d7f057..67007629c0 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1630,6 +1630,16 @@ S32 LLTextureFetch::update(U32 max_time_ms) { sendRequestListToSimulators(); } + + if (!mThreaded) + { + // Update Curl on same thread as mCurlGetRequest was constructed + S32 processed = mCurlGetRequest->process(); + if (processed > 0) + { + lldebugs << "processed: " << processed << " messages." << llendl; + } + } return res; } -- cgit v1.2.3 From b79d694f6d3ce6fda0a97941835d2da3501f2205 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Fri, 11 Dec 2009 20:51:06 -0700 Subject: replace some magic numbers of http status, and fix for DEV-40952/SNOW-208: HTTP GET requests for textures check for http status 203, but should check for 206. --- indra/newview/lltexturefetch.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lltexturefetch.cpp') diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 67007629c0..e29c96bec4 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -311,10 +311,10 @@ public: { bool success = false; bool partial = false; - if (200 <= status && status < 300) + if (HTTP_OK <= status && status < HTTP_MULTIPLE_CHOICES) { success = true; - if (203 == status) // partial information (i.e. last block) + if (HTTP_PARTIAL_CONTENT == status) // partial information (i.e. last block) { partial = true; } -- cgit v1.2.3