diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-12-05 13:38:01 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-12-05 13:38:01 -0600 |
| commit | 46a8ee0263aff727fde98874a720d1f929d91141 (patch) | |
| tree | 603ee21e2e8ab67c5ac489c259e927b68e4c9a0d /indra/newview/llxmlrpctransaction.cpp | |
| parent | a8cb28cb2c589a658900243f98c5c017b9a638c8 (diff) | |
| parent | a0873bf1b76b52de23b784e2c71db8d7cffd85bb (diff) | |
merge
Diffstat (limited to 'indra/newview/llxmlrpctransaction.cpp')
| -rw-r--r-- | indra/newview/llxmlrpctransaction.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index f483ba5af8..920a9a3752 100644 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -382,19 +382,11 @@ bool LLXMLRPCTransaction::Impl::process() // continue onward } } - - //const F32 MAX_PROCESSING_TIME = 0.05f; - //LLTimer timer; - - mCurlRequest->perform(); - - /*while (mCurlRequest->perform() > 0) + + if(!mCurlRequest->wait()) { - if (timer.getElapsedTimeF32() >= MAX_PROCESSING_TIME) - { - return false; - } - }*/ + return false ; + } while(1) { |