diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-05-24 18:34:52 +0000 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-05-24 18:34:52 +0000 |
| commit | 9f9465f5bd2160f0245805e32644ce37f8c6cca6 (patch) | |
| tree | 311d04d5aca4a4ab6d0660a6bd5af2fb7bd5e45b /indra/newview/llvoavatar.cpp | |
| parent | c0aa1a1202678fdde0206c9372fb071c028cfe5b (diff) | |
| parent | 3365a39080744af0566adb7b6efd8e53fc6b3339 (diff) | |
Merged DRTVWR-563 into SL-17219
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index add2ade0a1..b8ebe92430 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2809,6 +2809,7 @@ void LLVOAvatar::idleUpdateMisc(bool detailed_update) // update attachments positions if (detailed_update) { + U32 draw_order = 0; for (attachment_map_t::iterator iter = mAttachmentPoints.begin(); iter != mAttachmentPoints.end(); ++iter) @@ -2875,6 +2876,13 @@ void LLVOAvatar::idleUpdateMisc(bool detailed_update) bridge->setState(LLDrawable::MOVE_UNDAMPED); bridge->updateMove(); bridge->setState(LLDrawable::EARLY_MOVE); + + LLSpatialGroup* group = attached_object->mDrawable->getSpatialGroup(); + if (group) + { //set draw order of group + group->mAvatarp = this; + group->mRenderOrder = draw_order++; + } } } |