aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/doc/contributions.txt2
-rw-r--r--linden/indra/newview/llselectmgr.h2
2 files changed, 3 insertions, 1 deletions
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
42Aleric Inglewood 42Aleric Inglewood
43 VWR-10759 43 VWR-10759
44 VWR-10837 44 VWR-10837
45 VWR-13040
45 VWR-13996 46 VWR-13996
46 VWR-14426 47 VWR-14426
47 SNOW-84 48 SNOW-84
@@ -67,6 +68,7 @@ Aleric Inglewood
67 RED-566 68 RED-566
68 RED-567 69 RED-567
69 RED-573 70 RED-573
71 RED-575
70Alissa Sabre 72Alissa Sabre
71 VWR-81 73 VWR-81
72 VWR-83 74 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:
252 return (object != NULL) && node->mValid && !node->mIndividualSelection && (object->isRootEdit() || object->isJointChild()); 252 return (object != NULL) && node->mValid && !node->mIndividualSelection && (object->isRootEdit() || object->isJointChild());
253 } 253 }
254 }; 254 };
255 typedef boost::filter_iterator<is_root, list_t::iterator > valid_root_iterator; 255 typedef boost::filter_iterator<is_valid_root, list_t::iterator > valid_root_iterator;
256 valid_root_iterator valid_root_begin() { return valid_root_iterator(mList.begin(), mList.end()); } 256 valid_root_iterator valid_root_begin() { return valid_root_iterator(mList.begin(), mList.end()); }
257 valid_root_iterator valid_root_end() { return valid_root_iterator(mList.end(), mList.end()); } 257 valid_root_iterator valid_root_end() { return valid_root_iterator(mList.end(), mList.end()); }
258 258