From c07901e29ed545bbb02e3bddf148fe1104b94e9f Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:56 -0500
Subject: Second Life viewer sources 1.15.1.3

---
 linden/indra/llmessage/llxfermanager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'linden/indra/llmessage/llxfermanager.cpp')

diff --git a/linden/indra/llmessage/llxfermanager.cpp b/linden/indra/llmessage/llxfermanager.cpp
index 914488e..7758a32 100644
--- a/linden/indra/llmessage/llxfermanager.cpp
+++ b/linden/indra/llmessage/llxfermanager.cpp
@@ -223,8 +223,8 @@ LLXfer *LLXferManager::findXfer (U64 id, LLXfer *list_head)
 
 void LLXferManager::removeXfer (LLXfer *delp, LLXfer **list_head)
 {
-    LLXfer *xferp;
-	
+	// This function assumes that delp will only occur in the list
+	// zero or one times.
 	if (delp)
 	{
 		if (*list_head == delp)
@@ -234,14 +234,14 @@ void LLXferManager::removeXfer (LLXfer *delp, LLXfer **list_head)
 		}
 		else
 		{
-			xferp = *list_head;
+			LLXfer *xferp = *list_head;
 			while (xferp->mNext)
 			{
 				if (xferp->mNext == delp)
 				{
 					xferp->mNext = delp->mNext;
 					delete (delp);
-					continue;
+					break;
 				}
 				xferp = xferp->mNext;
 			}
-- 
cgit v1.1