From 96c1790d92b7c1c019b164e0e51338b83c33e873 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 26 Apr 2018 20:55:59 +0100
Subject: MAINT-8559 - create control avatar only when linkset contains a
rigged mesh
---
indra/newview/llviewerobject.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 32a1ccd852..5908d160e2 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2971,15 +2971,15 @@ void LLViewerObject::updateControlAvatar()
LLViewerObject *root = getRootEdit();
if (root->isAnimatedObject() && !root->getControlAvatar())
{
- bool any_mesh = root->isMesh();
+ bool any_rigged_mesh = root->isRiggedMesh();
LLViewerObject::const_child_list_t& child_list = root->getChildren();
for (LLViewerObject::const_child_list_t::const_iterator iter = child_list.begin();
iter != child_list.end(); ++iter)
{
const LLViewerObject* child = *iter;
- any_mesh = any_mesh || child->isMesh();
+ any_rigged_mesh = any_rigged_mesh || child->isRiggedMesh();
}
- if (any_mesh)
+ if (any_rigged_mesh)
{
std::string vobj_name = llformat("Vol%p", root);
LL_DEBUGS("AnimatedObjects") << vobj_name << " calling linkControlAvatar()" << LL_ENDL;
--
cgit v1.2.3