diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:18:31 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:18:31 -0400 |
commit | 7ccf02515ad3f9e3bf795d651fe4b3c0d773f353 (patch) | |
tree | c4adc897c07f652e617e91fbf41c12b823acc808 /indra/llmessage/llpacketbuffer.cpp | |
parent | 1abf5f18d6afc7ae9e1b1562b92e5c1ce33b722f (diff) | |
parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) |
Merge commit 'e7eced3' into lua-timers for whitespace fixes.
Diffstat (limited to 'indra/llmessage/llpacketbuffer.cpp')
-rw-r--r-- | indra/llmessage/llpacketbuffer.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/indra/llmessage/llpacketbuffer.cpp b/indra/llmessage/llpacketbuffer.cpp index ccf991b1a7..dc5c7a73cb 100644 --- a/indra/llmessage/llpacketbuffer.cpp +++ b/indra/llmessage/llpacketbuffer.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llpacketbuffer.cpp * @brief implementation of LLPacketBuffer class for a packet. * * $LicenseInfo:firstyear=2001&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -36,27 +36,27 @@ LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32 size) : mHost(host) { - mSize = 0; - mData[0] = '!'; + mSize = 0; + mData[0] = '!'; + + if (size > NET_BUFFER_SIZE) + { + LL_ERRS() << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << LL_ENDL; + } + else + { + if (datap != NULL) + { + memcpy(mData, datap, size); + mSize = size; + } + } - if (size > NET_BUFFER_SIZE) - { - LL_ERRS() << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << LL_ENDL; - } - else - { - if (datap != NULL) - { - memcpy(mData, datap, size); - mSize = size; - } - } - } LLPacketBuffer::LLPacketBuffer (S32 hSocket) { - init(hSocket); + init(hSocket); } /////////////////////////////////////////////////////////// @@ -69,8 +69,8 @@ LLPacketBuffer::~LLPacketBuffer () void LLPacketBuffer::init (S32 hSocket) { - mSize = receive_packet(hSocket, mData); - mHost = ::get_sender(); - mReceivingIF = ::get_receiving_interface(); + mSize = receive_packet(hSocket, mData); + mHost = ::get_sender(); + mReceivingIF = ::get_receiving_interface(); } |