diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
| commit | 24789f11cc58cf7c03283a8e9648085a5cb9d7d8 (patch) | |
| tree | bade7e21ca009bdb6a9f89b155732876bb02035d /indra/llmessage/lliosocket.cpp | |
| parent | a7499dc4abfa5fa7582dc7ebb535a07ed94d0c4f (diff) | |
| parent | 66f101bac591d82b71ab7dc976b6fed0ed451909 (diff) | |
Pull from 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) { |