diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
| commit | 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (patch) | |
| tree | 9c5958572368be494b6302db8b03967a2c67b7ad /indra/newview/llviewerobjectlist.cpp | |
| parent | a09f7d41efdb945755efaeb07f7418c1f6e2a78b (diff) | |
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index a37120451e..6d0137663c 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1163,9 +1163,11 @@ void LLViewerObjectList::generatePickList(LLCamera &camera) if (objectp) { mSelectPickList.insert(objectp); - for (U32 i = 0; i < objectp->mChildList.size(); i++) + LLViewerObject::const_child_list_t& child_list = objectp->getChildren(); + for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin(); + iter != child_list.end(); iter++) { - LLViewerObject* childp = objectp->mChildList[i]; + LLViewerObject* childp = *iter; if (childp) { mSelectPickList.insert(childp); |