summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-11 13:37:00 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-11 13:37:00 -0500
commitf042f35381f961e5648c239ae9dbf4b40941e96e (patch)
treeb713281f53c9c0e291b996731684b41e3b3bc1c5 /indra/newview/lltexturefetch.cpp
parentea3b99614327404f15f8c0cf98ae6d61bdd4572b (diff)
parentc74d5c483cbd75c5e2a0b17c8980755a9932c53a (diff)
Merge of viewer2 into avp branch
--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;
}