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/llfloatermodelpreview.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 9c72238d87..30051a79f1 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1712,6 +1712,8 @@ void LLModelPreview::getLegalJointNames(JointNameSet& legal_joint_names)
 {
     // Get all standard skeleton joints from the preview avatar.
     LLVOAvatar *av = getPreviewAvatar();
+ 
+    av->getLegalJointNames(legal_joint_names, true);
     const LLVOAvatar::avatar_joint_list_t &skel = av->getSkeleton();
     for (S32 i=0; i<skel.size(); i++)
     {
@@ -1775,6 +1777,10 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
     JointNameSet legal_joint_names;
     getLegalJointNames(legal_joint_names);
     
+    std::string joint_aliases_filename =
+                    gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"joint_aliases.xml");
+
+
 	mModelLoader = new LLDAELoader(
 		filename,
 		lod, 
@@ -1786,6 +1792,7 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
 		mJointTransformMap,
 		mJointsFromNode,
         legal_joint_names,
+        joint_aliases_filename,
 		gSavedSettings.getU32("ImporterModelLimit"));
 
 	if (force_disable_slm)
-- 
cgit v1.2.3