summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-12-10 16:06:01 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-12-10 16:06:01 +0200
commit6f5b47a4e7128d8e7b2f8a46c498a971ad39900e (patch)
tree181b43d1a870bff0863e3f7c0a4a752993cc9d4e /indra/newview/lltexturefetch.cpp
parent4df594defc4ad7f21139d99fb95197a0aa78854b (diff)
parent562d343c47570731664b34507359c823cfcbd634 (diff)
Merge from default branch.
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rw-r--r--indra/newview/lltexturefetch.cpp10
1 files changed, 10 insertions, 0 deletions
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;
}