summaryrefslogtreecommitdiff
path: root/indra/newview/llxmlrpctransaction.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-08-18 14:46:32 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-08-18 14:46:32 -0400
commitba1589d118db0c25f607c74f37834fe8feed9760 (patch)
tree908e3940d8c9624b1b0591567a35b2314ed6277c /indra/newview/llxmlrpctransaction.cpp
parent6c61a537918b5cc73336885f8bdd34943fda2482 (diff)
parentd36a9a7907a1528a8d163577a0770b50e6248802 (diff)
merged .hgtags
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)
{