diff options
| author | Richard Linden <none@none> | 2012-02-08 19:55:28 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-08 19:55:28 -0800 |
| commit | bbdb390624bd1289b330beed0f7bf30b3c94af8a (patch) | |
| tree | 070d2b78c0902dcad2f0d6767ca0b21f93bdfef7 /indra/llmessage/lliohttpserver.cpp | |
| parent | dd2bf737e08b3457dcd982ece5e200499dacf7d8 (diff) | |
| parent | 2ed1de224a45fafb12fea42e8dfb83f9728cdcf1 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to 'indra/llmessage/lliohttpserver.cpp')
| -rw-r--r-- | indra/llmessage/lliohttpserver.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp index 73e8a69085..987f386aa3 100644 --- a/indra/llmessage/lliohttpserver.cpp +++ b/indra/llmessage/lliohttpserver.cpp @@ -818,6 +818,8 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl( // Copy everything after mLast read to the out. LLBufferArray::segment_iterator_t seg_iter; + + buffer->lock(); seg_iter = buffer->splitAfter(mLastRead); if(seg_iter != buffer->endSegment()) { @@ -838,7 +840,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl( } #endif } - + buffer->unlock(); // // *FIX: get rid of extra bytes off the end // |