Eliminated joint_offset file. Added aliases attrib to bones in avatar_skeleton.xml.

1 files changed, 6 insertions, 8 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index d14ec7e55b..b6924e5904 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -940,15 +940,13 @@ std::string LLVOAvatar::rezStatusToString(S32 rez_status)
 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++)
+    LLAvatarAppearance::joint_alias_map_t alias_map = getJointAliases();
+
+    std::map<std::string, std::string>::iterator iter;
+
+    for (iter = alias_map.begin(); iter != alias_map.end(); ++iter)
     {
-        LLAvatarJoint *joint = skel[i];
-        if (joint)
-        {
-            legal_joint_names.push_back(joint->getName());
-        }
+        legal_joint_names.push_back(iter->first);
     }
     
     if (include_collision_volumes)