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/lliosocket.cpp | |
| parent | 4ef9277761b5faee2825177112939b72c563a4ea (diff) | |
| parent | 717a6f3306d9382ea252c3e0f243b785c9cae15a (diff) | |
merge changes for vmrg-219
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) { |