diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-30 13:31:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-30 13:31:26 -0400 |
| commit | e56ea836383bd357809f86e2ffebafee8f481222 (patch) | |
| tree | 8b5dd20b28261fba8b33953ef0f522914b2252c0 /indra/llmessage/lliosocket.cpp | |
| parent | 6f71df192720ec3f16e7e7102ad21f4d140b8e07 (diff) | |
| parent | e60dac5ce486f55fe69949a6a3a2949d4f868193 (diff) | |
merge changes for latest core and updates from Kitty
Diffstat (limited to 'indra/llmessage/lliosocket.cpp')
| -rw-r--r-- | indra/llmessage/lliosocket.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llmessage/lliosocket.cpp b/indra/llmessage/lliosocket.cpp index 54ceab3422..d5b4d45821 100644 --- a/indra/llmessage/lliosocket.cpp +++ b/indra/llmessage/lliosocket.cpp @@ -445,6 +445,7 @@ LLIOPipe::EStatus LLIOSocketWriter::process_impl( // efficient - not only because writev() is better, but also // because we won't have to do as much work to find the start // address. + buffer->lock(); LLBufferArray::segment_iterator_t it; LLBufferArray::segment_iterator_t end = buffer->endSegment(); LLSegment segment; @@ -524,6 +525,8 @@ LLIOPipe::EStatus LLIOSocketWriter::process_impl( } } + buffer->unlock(); + PUMP_DEBUG; if(done && eos) { |