diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-12-04 11:15:47 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-12-04 11:15:47 +0000 |
| commit | 4b439ff968a934c127cd685b54bcc206e467a948 (patch) | |
| tree | e23e4f9044d844d02c59b4b3d5016c130e0000ca /indra/newview/llvovolume.cpp | |
| parent | 0d2d6b42baa4fc6d253c5499324ffe5572676d87 (diff) | |
SL-704 - made avatar hierarchy more consistent by adding lluiavatar for viewer-local avs used in upload previews
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 8c722bf106..fc03373cc1 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3419,18 +3419,6 @@ bool LLVOVolume::isAnimatedObject() const LLVOVolume *root_vol = (LLVOVolume*)getRootEdit(); bool root_is_animated_flag = root_vol->getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG; return root_is_animated_flag; -#if 0 - if (root_is_animated_flag) - { - bool root_can_be_animated = root_vol->canBeAnimatedObject(); - bool this_can_be_animated = (root_vol == this) ? root_can_be_animated : canBeAnimatedObject(); - if (this_can_be_animated && root_can_be_animated) - { - return true; - } - } - return false; -#endif } // Called any time parenting changes for a volume. Update flags and |