summaryrefslogtreecommitdiff
path: root/indra/newview/llcontrolavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-10-01 16:11:09 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-10-01 16:11:09 +0100
commitaacb7eb25fd4caceaafb145ed550e14cebeef665 (patch)
treeb6fe18899ee218cddecfef91b231343c08ad2090 /indra/newview/llcontrolavatar.cpp
parent2c81ace766546da0ea11efd4fa27cf1717eb5411 (diff)
SL-9773 - treat animated object attachments the same as other rigged attachments for purposes of visibility in mouselook.
Diffstat (limited to 'indra/newview/llcontrolavatar.cpp')
-rw-r--r--indra/newview/llcontrolavatar.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index a620f2abe9..28c02b0434 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -574,3 +574,17 @@ std::string LLControlAvatar::getFullname() const
return "AO_no_root_vol";
}
}
+
+// virtual
+bool LLControlAvatar::shouldRenderRigged() const
+{
+ if (mRootVolp && mRootVolp->isAttachment())
+ {
+ LLVOAvatar *attached_av = mRootVolp->getAvatarAncestor();
+ if (attached_av)
+ {
+ return attached_av->shouldRenderRigged();
+ }
+ }
+ return true;
+}