diff options
| author | prep <none@none> | 2012-01-31 15:13:16 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-01-31 15:13:16 -0500 |
| commit | 9e1479d610af1edd799a790ff18155fbb6ec5c89 (patch) | |
| tree | f086f457880855cac99059c1868b5dcd40a5185b /indra/llmessage/lliohttpserver.cpp | |
| parent | 8f6524d999d5153ff4b89abafb35bc96870d6230 (diff) | |
| parent | 2c9a68c036eec1d1a021df305bf032d0c78da139 (diff) | |
merge
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 // |