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/llviewerjointattachment.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/llviewerjointattachment.cpp')
| -rw-r--r-- | indra/newview/llviewerjointattachment.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp index 0a2e328015..d66d0da5b1 100644 --- a/indra/newview/llviewerjointattachment.cpp +++ b/indra/newview/llviewerjointattachment.cpp @@ -129,8 +129,9 @@ void LLViewerJointAttachment::setupDrawable(LLDrawable* drawablep) } } - for (LLViewerObject::child_list_t::iterator iter = mAttachedObject->mChildList.begin(); - iter != mAttachedObject->mChildList.end(); ++iter) + LLViewerObject::const_child_list_t& child_list = mAttachedObject->getChildren(); + for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin(); + iter != child_list.end(); iter++) { LLViewerObject* childp = *iter; if (childp && childp->mDrawable.notNull()) @@ -208,8 +209,9 @@ BOOL LLViewerJointAttachment::addObject(LLViewerObject* object) { object->mText->setOnHUDAttachment(TRUE); } - for (LLViewerObject::child_list_t::iterator iter = object->mChildList.begin(); - iter != object->mChildList.end(); ++iter) + LLViewerObject::const_child_list_t& child_list = object->getChildren(); + for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin(); + iter != child_list.end(); iter++) { LLViewerObject* childp = *iter; if (childp && childp->mText.notNull()) @@ -258,8 +260,9 @@ void LLViewerJointAttachment::removeObject(LLViewerObject *object) } } - for (LLViewerObject::child_list_t::iterator iter = object->mChildList.begin(); - iter != object->mChildList.end(); ++iter) + LLViewerObject::const_child_list_t& child_list = object->getChildren(); + for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin(); + iter != child_list.end(); iter++) { LLViewerObject* childp = *iter; if (childp && childp->mDrawable.notNull()) @@ -282,8 +285,9 @@ void LLViewerJointAttachment::removeObject(LLViewerObject *object) { object->mText->setOnHUDAttachment(FALSE); } - for (LLViewerObject::child_list_t::iterator iter = object->mChildList.begin(); - iter != object->mChildList.end(); ++iter) + LLViewerObject::const_child_list_t& child_list = object->getChildren(); + for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin(); + iter != child_list.end(); iter++) { LLViewerObject* childp = *iter; if (childp->mText.notNull()) @@ -351,8 +355,9 @@ void LLViewerJointAttachment::clampObjectPosition() void LLViewerJointAttachment::calcLOD() { F32 maxarea = mAttachedObject->getMaxScale() * mAttachedObject->getMidScale(); - for (LLViewerObject::child_list_t::iterator iter = mAttachedObject->mChildList.begin(); - iter != mAttachedObject->mChildList.end(); ++iter) + LLViewerObject::const_child_list_t& child_list = mAttachedObject->getChildren(); + for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin(); + iter != child_list.end(); iter++) { LLViewerObject* childp = *iter; F32 area = childp->getMaxScale() * childp->getMidScale(); |