summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-07-21 17:35:04 -0500
committerDave Parks <davep@lindenlab.com>2011-07-21 17:35:04 -0500
commit764a13a196fb66bf4b3fe4fcf98625a385e99e6e (patch)
tree2543a95a2a58adfb85e5feddf3d790b4a8a7511d /indra/newview
parent65d82fe192bdb4eb27766cf02eadaf78012f2817 (diff)
SH-2031 Don't do network I/O from the main thread in llcurl.
Reviewed by Kelly
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llxmlrpctransaction.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index 257884d921..bd1d2ed7a7 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -394,16 +394,18 @@ bool LLXMLRPCTransaction::Impl::process()
}
}
- const F32 MAX_PROCESSING_TIME = 0.05f;
- LLTimer timer;
+ //const F32 MAX_PROCESSING_TIME = 0.05f;
+ //LLTimer timer;
- while (mCurlRequest->perform() > 0)
+ mCurlRequest->perform();
+
+ /*while (mCurlRequest->perform() > 0)
{
if (timer.getElapsedTimeF32() >= MAX_PROCESSING_TIME)
{
return false;
}
- }
+ }*/
while(1)
{