From f7ae9b80b39003e862f5e65a160d8d1fbbdc0532 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Thu, 30 Sep 2010 15:15:54 +0200
Subject: RED-575: VWR-13040: LLObjectSelection::valid_root_begin() is really
 the same as LLObjectSelection::root_begin()

See http://redmine.imprudenceviewer.org/issues/575
---
 linden/doc/contributions.txt       | 2 ++
 linden/indra/newview/llselectmgr.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 49ea94b..71a076d 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -42,6 +42,7 @@ Alejandro Rosenthal
 Aleric Inglewood
 	VWR-10759
 	VWR-10837
+	VWR-13040
 	VWR-13996
 	VWR-14426
 	SNOW-84
@@ -67,6 +68,7 @@ Aleric Inglewood
 	RED-566
 	RED-567
 	RED-573
+	RED-575
 Alissa Sabre
 	VWR-81
 	VWR-83
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index 6278049..c19d33d 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -252,7 +252,7 @@ public:
 			return (object != NULL) && node->mValid && !node->mIndividualSelection && (object->isRootEdit() || object->isJointChild());
 		}
 	};
-	typedef boost::filter_iterator<is_root, list_t::iterator > valid_root_iterator;
+	typedef boost::filter_iterator<is_valid_root, list_t::iterator > valid_root_iterator;
 	valid_root_iterator valid_root_begin() { return valid_root_iterator(mList.begin(), mList.end()); }
 	valid_root_iterator valid_root_end() { return valid_root_iterator(mList.end(), mList.end()); }
 	
-- 
cgit v1.1