From 7dada07dbaae3dfb9b1319453e51019bfff2717f Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Tue, 20 Feb 2007 22:02:36 +0000
Subject: svn merge -r 57620:58007
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

---
 indra/llmessage/lltransfermanager.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/llmessage')

diff --git a/indra/llmessage/lltransfermanager.cpp b/indra/llmessage/lltransfermanager.cpp
index 51c3aafbbb..4eea7418af 100644
--- a/indra/llmessage/lltransfermanager.cpp
+++ b/indra/llmessage/lltransfermanager.cpp
@@ -719,8 +719,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();
-- 
cgit v1.2.3