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/llprimitive/lldaeloader.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llprimitive/lldaeloader.cpp')

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index c50db824af..63457512ff 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -811,6 +811,7 @@ LLDAELoader::LLDAELoader(
 	JointTransformMap&	jointTransformMap,
 	JointNameSet&		jointsFromNodes,
     JointNameSet&		legalJointNames,
+    std::string         jointAliasesFilename,
 	U32					modelLimit)
 : LLModelLoader(
 		filename,
@@ -822,7 +823,8 @@ LLDAELoader::LLDAELoader(
 		opaque_userdata,
 		jointTransformMap,
 		jointsFromNodes,
-        legalJointNames),
+        legalJointNames,
+        jointAliasesFilename),
 mGeneratedModelLimit(modelLimit)
 {
 }
-- 
cgit v1.2.3