diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-11-21 15:02:50 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-11-21 15:02:50 -0700 |
| commit | 147b14089916bd2cbb078b0bc47c76458ab31e79 (patch) | |
| tree | aaa8fb0fc2000dd19206871df793f3e7ee76afa5 /indra/newview/llxmlrpctransaction.cpp | |
| parent | ebf0b70e05f2d6539dd14c28a8a327105523025d (diff) | |
| parent | b4766d2fde6b74c5a4a50cdde4373b5261a020e2 (diff) | |
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
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) { |