From 80d7432ce6f0f16f31bb103965b64b39575728a2 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Thu, 20 Jan 2011 14:26:57 -0500
Subject: [PATCH] VWR-13040 - clean up LLObjectSelection iterator
---
doc/contributions.txt | 1 +
indra/newview/llselectmgr.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 361560a0ede..d533486936d 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -72,6 +72,7 @@ Aleric Inglewood
VWR-10837
VWR-12691
VWR-12984
+ VWR-13040
VWR-13996
VWR-14426
VWR-24247
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 7478ed5f9a3..65a9a493f60 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -235,7 +235,7 @@ class LLObjectSelection : public LLRefCount
{
bool operator()(LLSelectNode* node);
};
- 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()); }
--
GitLab