diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-30 15:48:44 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-30 15:48:44 -0500 |
| commit | 1ed8faee81804af2f0640784191f1deadfa9f50c (patch) | |
| tree | 1bbee24e0c0c388b1f0544145db8eff1588546f7 /indra/llmessage/lliohttpserver.cpp | |
| parent | 4ef9277761b5faee2825177112939b72c563a4ea (diff) | |
| parent | 717a6f3306d9382ea252c3e0f243b785c9cae15a (diff) | |
merge changes for vmrg-219
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 // |