diff options
author | seth_productengine <none@none> | 2011-08-08 15:43:00 +0300 |
---|---|---|
committer | seth_productengine <none@none> | 2011-08-08 15:43:00 +0300 |
commit | df353a6746f6261ac238d29a418962bbab62ec5b (patch) | |
tree | 113a11702c5de5fa0e9097f3129927b249aa2781 /indra/newview/llfloatermodelpreview.h | |
parent | ef6e51db22ad3aec42b19bcf3e077ff000ba8929 (diff) | |
parent | 575c7f85b20fca57fcd97a2a18bd7ad0c030a935 (diff) |
Merge with 8582496d7733948e19396167df9b4d2d4cd35f0c
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
-rw-r--r-- | indra/newview/llfloatermodelpreview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index c24e171024..f383b3fe98 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -125,7 +125,7 @@ public: void buildJointToNodeMappingFromScene( daeElement* pRoot ); void processJointToNodeMapping( domNode* pNode ); - + void processChildJoints( domNode* pParentNode ); //map of avatar joints as named in COLLADA assets to internal joint names std::map<std::string, std::string> mJointMap; |