summaryrefslogtreecommitdiff
path: root/indra/llmessage/llpacketbuffer.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-02-26 17:34:39 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-02-26 17:34:39 -0800
commit5352954eb65076d877cc74d4328620e910b93d1c (patch)
treea8bf1c956c0de44a5ab7eb0a2a05d5e9ed29b751 /indra/llmessage/llpacketbuffer.cpp
parent13d4257868451d1e3a5797bd02a0e6f749cc0836 (diff)
parentb1891e2982cc03ccd695eae82989d3e58695616c (diff)
automated merge
Diffstat (limited to 'indra/llmessage/llpacketbuffer.cpp')
-rw-r--r--indra/llmessage/llpacketbuffer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llmessage/llpacketbuffer.cpp b/indra/llmessage/llpacketbuffer.cpp
index 027d35cf89..441e8ddd27 100644
--- a/indra/llmessage/llpacketbuffer.cpp
+++ b/indra/llmessage/llpacketbuffer.cpp
@@ -42,11 +42,14 @@
LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32 size) : mHost(host)
{
+ mSize = 0;
+ mData[0] = '!';
+
if (size > NET_BUFFER_SIZE)
{
llerrs << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << llendl;
}
- else // we previously relied on llerrs being fatal to not get here...
+ else
{
if (datap != NULL)
{