merged jelly-doll viewer-release into bento

1 files changed, 16 insertions, 4 deletions

diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp
index e5df417ca9..d33a138e94 100644
--- a/indra/newview/llfloaterbvhpreview.cpp
+++ b/indra/newview/llfloaterbvhpreview.cpp
@@ -178,6 +178,12 @@ void LLFloaterBvhPreview::setAnimCallbacks()
 	getChild<LLUICtrl>("ease_out_time")->setValidateBeforeCommit( boost::bind(&LLFloaterBvhPreview::validateEaseOut, this, _1));
 }
 
+std::map <std::string, std::string> LLFloaterBvhPreview::getJointAliases()
+{
+    LLPointer<LLVOAvatar> av = (LLVOAvatar*)mAnimPreview->getDummyAvatar();
+    return av->getJointAliases();
+}
+
 //-----------------------------------------------------------------------------
 // postBuild()
 //-----------------------------------------------------------------------------
@@ -215,6 +221,8 @@ BOOL LLFloaterBvhPreview::postBuild()
 
 	getChildView("bad_animation_text")->setVisible(FALSE);
 
+    mAnimPreview = new LLPreviewAnimation(256, 256);
+    
 	std::string exten = gDirUtilp->getExtension(mFilename);
 	if (exten == "bvh")
 	{
@@ -241,8 +249,11 @@ BOOL LLFloaterBvhPreview::postBuild()
 				file_buffer[file_size] = '\0';
 				LL_INFOS() << "Loading BVH file " << mFilename << LL_ENDL;
 				ELoadStatus load_status = E_ST_OK;
-				S32 line_number = 0; 
-				loaderp = new LLBVHLoader(file_buffer, load_status, line_number);
+				S32 line_number = 0;
+
+                std::map<std::string, std::string> joint_alias_map = getJointAliases();
+    
+				loaderp = new LLBVHLoader(file_buffer, load_status, line_number, joint_alias_map);
 				std::string status = getString(STATUS[load_status]);
 				
 				if(load_status == E_ST_NO_XLT_FILE)
@@ -266,8 +277,6 @@ BOOL LLFloaterBvhPreview::postBuild()
 		mTransactionID.generate();
 		mMotionID = mTransactionID.makeAssetID(gAgent.getSecureSessionID());
 
-		mAnimPreview = new LLPreviewAnimation(256, 256);
-
 		// motion will be returned, but it will be in a load-pending state, as this is a new motion
 		// this motion will not request an asset transfer until next update, so we have a chance to 
 		// load the keyframe data locally
@@ -280,9 +289,12 @@ BOOL LLFloaterBvhPreview::postBuild()
 		LLDataPackerBinaryBuffer dp(buffer, buffer_size);
 
 		// pass animation data through memory buffer
+		LL_INFOS("BVH") << "Serializing loaderp" << LL_ENDL;
 		loaderp->serialize(dp);
 		dp.reset();
+		LL_INFOS("BVH") << "Deserializing motionp" << LL_ENDL;
 		BOOL success = motionp && motionp->deserialize(dp);
+		LL_INFOS("BVH") << "Done" << LL_ENDL;
 
 		delete []buffer;