summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llbvhloader.h
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2015-11-13 04:12:13 -0800
committerAura Linden <aura@lindenlab.com>2015-11-13 04:12:13 -0800
commit99219cbe80d56dbd9d6f75689304ce2759592868 (patch)
treeedddfd8003e918e5f922c500560b4ffcc2dd0689 /indra/llcharacter/llbvhloader.h
parent146919fa764bed09bfa5e27bc30d02ce2afb6188 (diff)
parentb72480ddb9b01202f1bbe4bfb84595549faeacf3 (diff)
Eliminated joint_offset file. Added aliases attrib to bones in avatar_skeleton.xml.
Diffstat (limited to 'indra/llcharacter/llbvhloader.h')
-rwxr-xr-xindra/llcharacter/llbvhloader.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llbvhloader.h b/indra/llcharacter/llbvhloader.h
index a0207750ed..01a7c8ad16 100755
--- a/indra/llcharacter/llbvhloader.h
+++ b/indra/llcharacter/llbvhloader.h
@@ -230,7 +230,7 @@ public:
// Constructor
// LLBVHLoader(const char* buffer);
LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &errorLine);
- LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &errorLine, std::deque<std::string>& legal_joint_names);
+ LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &errorLine, std::map<std::string, std::string>& joint_alias_map );
~LLBVHLoader();
/*