From 146919fa764bed09bfa5e27bc30d02ce2afb6188 Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Wed, 11 Nov 2015 13:44:51 -0800
Subject: animations and meshes will recognize all joint names in
 joint_aliases.xml

---
 indra/newview/llvoavatar.cpp | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'indra/newview/llvoavatar.cpp')

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 3b482e1bc0..d14ec7e55b 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -937,6 +937,29 @@ std::string LLVOAvatar::rezStatusToString(S32 rez_status)
 	return "unknown";
 }
 
+void LLVOAvatar::getLegalJointNames(std::deque<std::string>& legal_joint_names,
+                                    bool include_collision_volumes)
+{
+    // Get all standard skeleton joints from the preview avatar.
+    const LLVOAvatar::avatar_joint_list_t &skel = getSkeleton();
+    for (S32 i=0; i<skel.size(); i++)
+    {
+        LLAvatarJoint *joint = skel[i];
+        if (joint)
+        {
+            legal_joint_names.push_back(joint->getName());
+        }
+    }
+    
+    if (include_collision_volumes)
+    {
+        for (S32 i = 0; i < mNumCollisionVolumes; i++)
+        {
+            legal_joint_names.push_back(mCollisionVolumes[i].getName());
+        }
+    }
+}
+
 // static
 void LLVOAvatar::dumpBakedStatus()
 {
-- 
cgit v1.3