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/lliosocket.cpp | |
| parent | dd2bf737e08b3457dcd982ece5e200499dacf7d8 (diff) | |
| parent | 2ed1de224a45fafb12fea42e8dfb83f9728cdcf1 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
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) { |