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/lliosocket.cpp | |
| parent | 8f6524d999d5153ff4b89abafb35bc96870d6230 (diff) | |
| parent | 2c9a68c036eec1d1a021df305bf032d0c78da139 (diff) | |
merge
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) { |