From 305c74d5163c5e344a675d39ca2394a9e45bd2c2 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Fri, 2 Feb 2007 17:28:58 +0000
Subject: Result of svn merge -r57264:57370
 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.

---
 indra/llmessage/llpacketring.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/llmessage/llpacketring.cpp b/indra/llmessage/llpacketring.cpp
index 1bf72edfc1..e3612120d1 100644
--- a/indra/llmessage/llpacketring.cpp
+++ b/indra/llmessage/llpacketring.cpp
@@ -113,7 +113,7 @@ S32 LLPacketRing::receiveFromRing (S32 socket, char *datap)
 	packet_size = packetp->getSize();
 	if (packetp->getData() != NULL)
 	{
-		memcpy(datap, packetp->getData(), packet_size);
+		memcpy(datap, packetp->getData(), packet_size);	/*Flawfinder: ignore*/
 	}
 	// need to set sender IP/port!!
 	mLastSender = packetp->getHost();
-- 
cgit v1.2.3