From ce888706c5589bbd30423cd1cbfb7b168b16d680 Mon Sep 17 00:00:00 2001
From: Robert Knop <prospero@lindenlab.com>
Date: Mon, 19 Jan 2009 22:05:19 +0000
Subject: svn merge -r108236:108243
 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

Still merging from server-1.25... one day I will catch up!

No conflicts
---
 indra/llmessage/llpacketring.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llmessage/llpacketring.cpp')

diff --git a/indra/llmessage/llpacketring.cpp b/indra/llmessage/llpacketring.cpp
index 6ecdf702ac..35d5aac776 100644
--- a/indra/llmessage/llpacketring.cpp
+++ b/indra/llmessage/llpacketring.cpp
@@ -141,6 +141,7 @@ S32 LLPacketRing::receiveFromRing (S32 socket, char *datap)
 	}
 	// need to set sender IP/port!!
 	mLastSender = packetp->getHost();
+	mLastReceivingIF = packetp->getReceivingInterface();
 	delete packetp;
 
 	this->mInBufferLength -= packet_size;
@@ -223,6 +224,7 @@ S32 LLPacketRing::receivePacket (S32 socket, char *datap)
 		// no delay, pull straight from net
 		packet_size = receive_packet(socket, datap);		
 		mLastSender = ::get_sender();
+		mLastReceivingIF = ::get_receiving_interface();
 
 		if (packet_size)  // did we actually get a packet?
 		{
-- 
cgit v1.2.3