1 files changed, 13 insertions, 7 deletions

diff --git a/linden/indra/llmessage/lltransfermanager.cpp b/linden/indra/llmessage/lltransfermanager.cpp
index bfeedd0..43afa78 100644
--- a/linden/indra/llmessage/lltransfermanager.cpp
+++ b/linden/indra/llmessage/lltransfermanager.cpp
@@ -354,7 +354,7 @@ void LLTransferManager::processTransferInfo(LLMessageSystem *msgp, void **)
                 {
                         // Perhaps this stuff should be inside a method in LLTransferPacket?
                         // I'm too lazy to do it now, though.
-                        llinfos << "Playing back delayed packet " << packet_id << llendl;
+//                      llinfos << "Playing back delayed packet " << packet_id << llendl;
                         LLTransferPacket *packetp = ttp->mDelayedPacketMap[packet_id];
 
                         // This is somewhat inefficient, but avoids us having to duplicate
@@ -365,7 +365,7 @@ void LLTransferManager::processTransferInfo(LLMessageSystem *msgp, void **)
                         {
                                 if ((packetp->mDatap != NULL) && (size<(S32)sizeof(tmp_data)))
                                 {
-                                        memcpy(tmp_data, packetp->mDatap, size);
+                                        memcpy(tmp_data, packetp->mDatap, size);        /*Flawfinder: ignore*/
                                 }
                         }
                         status = packetp->mStatus;
@@ -474,6 +474,8 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
                         ttcp->deleteTransfer(ttp);
                         return;
                 }
+#if 0
+                // Spammy!
                 const S32 LL_TRANSFER_WARN_GAP = 10;
                 if(!ttp->gotInfo())
                 {
@@ -487,6 +489,7 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
                                 << " from " << msgp->getSender() << ", got " << packet_id
                                 << " expecting " << ttp->getNextPacketID() << llendl;
                 }
+#endif
                 return;
         }
 
@@ -527,7 +530,7 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
                 {
                         // Perhaps this stuff should be inside a method in LLTransferPacket?
                         // I'm too lazy to do it now, though.
-                        llinfos << "Playing back delayed packet " << packet_id << llendl;
+//                      llinfos << "Playing back delayed packet " << packet_id << llendl;
                         LLTransferPacket *packetp = ttp->mDelayedPacketMap[packet_id];
 
                         // This is somewhat inefficient, but avoids us having to duplicate
@@ -538,7 +541,7 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
                         {
                                 if ((packetp->mDatap != NULL) && (size<(S32)sizeof(tmp_data)))
                                 {
-                                        memcpy(tmp_data, packetp->mDatap, size);
+                                        memcpy(tmp_data, packetp->mDatap, size);        /*Flawfinder: ignore*/
                                 }
                         }
                         status = packetp->mStatus;
@@ -738,8 +741,11 @@ LLTransferSourceChannel::LLTransferSourceChannel(const LLTransferChannelType cha
 
 LLTransferSourceChannel::~LLTransferSourceChannel()
 {
-        LLPriQueueMap<LLTransferSource *>::pqm_iter iter;
-        for (iter = mTransferSources.mMap.begin(); iter != mTransferSources.mMap.end(); iter++)
+        LLPriQueueMap<LLTransferSource*>::pqm_iter iter =
+                mTransferSources.mMap.begin();
+        LLPriQueueMap<LLTransferSource*>::pqm_iter end =
+                mTransferSources.mMap.end();
+        for (; iter != end; ++iter)
         {
                 // Just kill off all of the transfers
                 (*iter).second->abortTransfer();
@@ -1176,7 +1182,7 @@ LLTransferPacket::LLTransferPacket(const S32 packet_id, const LLTSCode status, c
         mDatap = new U8[size];
         if (mDatap != NULL)
         {
-                memcpy(mDatap, datap, size);
+                memcpy(mDatap, datap, size);    /*Flawfinder: ignore*/
         }
 }