diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
| commit | fb793870fe95f1951d7c30ea6068e187b9dededd (patch) | |
| tree | 6d11632353ff4fb07133625ec5031b135b1e2882 /indra/newview/llselectmgr.cpp | |
| parent | d182b9fb82b9c63f41d81bc80dbbfe627475facf (diff) | |
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
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
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; } |