summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.h
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2015-11-11 13:44:51 -0800
committerAura Linden <aura@lindenlab.com>2015-11-11 13:44:51 -0800
commit146919fa764bed09bfa5e27bc30d02ce2afb6188 (patch)
treeb073b1a0e140a7fff67ca309acc6dcbc1f477267 /indra/newview/llvoavatar.h
parent07496b015b01899b21960b60d2f3af7bf317c349 (diff)
animations and meshes will recognize all joint names in joint_aliases.xml
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rwxr-xr-xindra/newview/llvoavatar.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 7a2355b447..29f70fca18 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -72,6 +72,7 @@ class LLTexGlobalColor;
struct LLAppearanceMessageContents;
class LLViewerJointMesh;
+
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// LLVOAvatar
//
@@ -146,6 +147,8 @@ public:
void collectBakedTextureUUIDs(std::set<LLUUID>& ids) const;
void collectTextureUUIDs(std::set<LLUUID>& ids);
void releaseOldTextures();
+ void getLegalJointNames(std::deque<std::string>& legal_joint_names,
+ bool include_collision_volumes);
/*virtual*/ void updateTextures();
LLViewerFetchedTexture* getBakedTextureImage(const U8 te, const LLUUID& uuid);
/*virtual*/ S32 setTETexture(const U8 te, const LLUUID& uuid); // If setting a baked texture, need to request it from a non-local sim.