diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-11-21 14:42:21 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-11-21 14:42:21 -0700 |
| commit | b4766d2fde6b74c5a4a50cdde4373b5261a020e2 (patch) | |
| tree | bf1c28c24730a3ab63f446c94558dfa5b70ee48e /indra/newview/llxmlrpctransaction.cpp | |
| parent | 6c9227df13facff681adb95b9715c35cc3077531 (diff) | |
fix for sh-2601: [crashhunters] crash in LLBufferArray::countAfter()
sh-2602: [crashhunters] crash on exit in ~LLPumpIO()
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) { |