diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-29 14:43:48 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-29 14:43:48 -0600 |
| commit | 472928043a82ff8f622c96df73c5938c9fb7a455 (patch) | |
| tree | d795d47eff1c609b42ab3b57be3a7c11538b1b23 /indra/newview/llxmlrpctransaction.cpp | |
| parent | 893b5e16b81ead08ef22b03594e0a835df525778 (diff) | |
| parent | 85392acac0a10e274a3134180265b7b233d8b479 (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) { |