From fb793870fe95f1951d7c30ea6068e187b9dededd Mon Sep 17 00:00:00 2001 From: Mark Palange Date: Tue, 23 Dec 2008 19:39:58 +0000 Subject: QAR-1142 merging 1.22 RC0-RC4 changes. svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge --- indra/newview/llselectmgr.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'indra/newview/llselectmgr.cpp') diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 7b7bdfd582..81decdf40a 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5940,9 +5940,9 @@ S32 LLObjectSelection::getRootObjectCount() return count; } -bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func, bool firstonly) +bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func) { - bool result = firstonly ? false : true; + bool result = true; for (iterator iter = begin(); iter != end(); ) { iterator nextiter = iter++; @@ -5950,10 +5950,7 @@ bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func, bool first if (!object) continue; bool r = func->apply(object); - if (firstonly && r) - return true; - else - result = result && r; + result = result && r; } return result; } -- cgit v1.2.3