summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorskolb <none@none>2009-12-11 08:49:37 -0800
committerskolb <none@none>2009-12-11 08:49:37 -0800
commit6542ffe2f05c47d74dfbe659041d956d609f91f3 (patch)
tree7794c0737c5a78b0339c2c34b47c9d32c44de749 /indra/newview/lltexturefetch.cpp
parent431bfca2ade364dc1165e402537e5e2d3616ebfd (diff)
parenteda8634b17133df5f3104d96ad56d3626a90aad8 (diff)
Merge viewer 2-0 into media
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;
}