summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-12-09 18:18:01 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-12-09 18:18:01 -0800
commit562d343c47570731664b34507359c823cfcbd634 (patch)
tree8b7727a0ee8e985dc5558046d256a2d05ce0e5a0 /indra
parentd8d6a6d1b7449a940473a2b2b1ee0796e3a6a625 (diff)
EXT-3298 world map does not load simulator textures
Forgot to add LLCurl update call to non threaded LLTextureFetch update.
Diffstat (limited to 'indra')
-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;
}