summaryrefslogtreecommitdiff
path: root/indra/newview/llxmlrpctransaction.cpp
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-08-15 20:35:39 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2011-08-15 20:35:39 +0300
commitfecec49081419dbd7a66533e4d0457784b8d26a0 (patch)
tree457018dc36300b5c2a355aedd771861d6b300697 /indra/newview/llxmlrpctransaction.cpp
parentc70a357a274d5acd7921c3185dc34b89069d4e61 (diff)
parent5c0df02df5abdadbf17235ae5d7208963c25f1ce (diff)
Merge
Diffstat (limited to 'indra/newview/llxmlrpctransaction.cpp')
-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)
{