From 5cc44523f79b6cf495d2649fce9bf9e5181787e8 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Fri, 9 Feb 2007 23:35:12 +0000
Subject: Result of svn merge -r57350:57790
 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.

---
 indra/newview/llselectmgr.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llselectmgr.cpp')

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 50f6d115bd..3ae4ba9107 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6343,13 +6343,17 @@ void LLSelectNodeList::addNodeAtEnd(LLSelectNode *nodep)
 
 void LLSelectNodeList::removeNode(LLSelectNode *nodep)
 {
-	std::list<LLSelectNode*>::iterator iter;
-	for (iter = begin(); iter != end(); ++iter)
+	std::list<LLSelectNode*>::iterator iter = begin();
+	while(iter != end())
 	{
 		if ((*iter) == nodep)
 		{
 			mSelectNodeMap.erase(nodep->getObject());
-			erase(iter++);
+			iter = erase(iter);
+		}
+		else
+		{
+			++iter;
 		}
 	}
 }
-- 
cgit v1.3