summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-11 16:01:44 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-11 16:01:44 -0500
commit99590047eb322d76a90c417bf0e6b2ec0e189d52 (patch)
treeeaab40ba586d097bf5c1dd4b6ef673c1284ff477 /indra/newview/lltexturefetch.cpp
parentd2b72fe0184fb92f4a79eebd242825fbcc5f32e9 (diff)
parent1f3a55470919bf451f9c45b454d9bbf815a3e88a (diff)
automated merge avp->avp
--HG-- branch : avatar-pipeline
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;
}