aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmessage/llpacketring.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-30 13:04:20 -0500
committerJacek Antonelli2009-04-30 13:07:16 -0500
commitca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch)
tree8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/llmessage/llpacketring.cpp
parentSecond Life viewer sources 1.22.11 (diff)
downloadmeta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz
Second Life viewer sources 1.23.0-RC
Diffstat (limited to 'linden/indra/llmessage/llpacketring.cpp')
-rw-r--r--linden/indra/llmessage/llpacketring.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/llmessage/llpacketring.cpp b/linden/indra/llmessage/llpacketring.cpp
index cd59b12..35d5aac 100644
--- a/linden/indra/llmessage/llpacketring.cpp
+++ b/linden/indra/llmessage/llpacketring.cpp
@@ -17,7 +17,8 @@
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception 20 * online at
21 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 22 *
22 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -140,6 +141,7 @@ S32 LLPacketRing::receiveFromRing (S32 socket, char *datap)
140 } 141 }
141 // need to set sender IP/port!! 142 // need to set sender IP/port!!
142 mLastSender = packetp->getHost(); 143 mLastSender = packetp->getHost();
144 mLastReceivingIF = packetp->getReceivingInterface();
143 delete packetp; 145 delete packetp;
144 146
145 this->mInBufferLength -= packet_size; 147 this->mInBufferLength -= packet_size;
@@ -222,6 +224,7 @@ S32 LLPacketRing::receivePacket (S32 socket, char *datap)
222 // no delay, pull straight from net 224 // no delay, pull straight from net
223 packet_size = receive_packet(socket, datap); 225 packet_size = receive_packet(socket, datap);
224 mLastSender = ::get_sender(); 226 mLastSender = ::get_sender();
227 mLastReceivingIF = ::get_receiving_interface();
225 228
226 if (packet_size) // did we actually get a packet? 229 if (packet_size) // did we actually get a packet?
227 { 230 {