diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
| commit | 1c909afe3998778e4cc045c9ab733e8afbf7c25b (patch) | |
| tree | 75c00a32a8e305280cbec253195d1113d628fc3e /indra/llmessage/llpacketbuffer.cpp | |
| parent | bc59c04653bf1404e8148a8169208b146a123b28 (diff) | |
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llmessage/llpacketbuffer.cpp')
| -rw-r--r-- | indra/llmessage/llpacketbuffer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llmessage/llpacketbuffer.cpp b/indra/llmessage/llpacketbuffer.cpp index d5796c131b..405a5241cd 100644 --- a/indra/llmessage/llpacketbuffer.cpp +++ b/indra/llmessage/llpacketbuffer.cpp @@ -22,11 +22,13 @@ LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32 { llerrs << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << llendl; } - - if (datap != NULL) + else // we previously relied on llerrs being fatal to not get here... { - memcpy(mData, datap, size); /*Flawfinder: ignore*/ - mSize = size; + if (datap != NULL) + { + memcpy(mData, datap, size); + mSize = size; + } } } |