From 3cf938bcec9a4925a4f7d8becb9b89ff559eb2e3 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 4 Nov 2015 16:41:37 -0500
Subject: SL-124 WIP - BENTO comments and related cleanup

---
 indra/llcharacter/llbvhloader.cpp | 3 +--
 indra/llcharacter/lljoint.h       | 2 +-
 indra/llprimitive/lldaeloader.cpp | 4 ----
 indra/llprimitive/llmodel.h       | 2 --
 indra/newview/llskinningutil.cpp  | 4 +---
 5 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp
index 4dedeeab52..b4f0bb9e18 100755
--- a/indra/llcharacter/llbvhloader.cpp
+++ b/indra/llcharacter/llbvhloader.cpp
@@ -903,8 +903,7 @@ ELoadStatus LLBVHLoader::loadBVHFile(const char *buffer, char* error_text, S32 &
 			return E_ST_NO_CHANNELS;
 		}
 
-        // FIXME BENTO do we want to open up motion of non-hip joints or
-        // not? Already effectively allowed via .anim upload.
+        // Animating position (via mNumChannels = 6) is only supported for mPelvis.
 		int res = sscanf(line.c_str(), " CHANNELS %d", &joint->mNumChannels);
 		if ( res != 1 )
 		{
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index 2a8ebed408..8d380cdc82 100755
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -40,7 +40,7 @@
 #include "xform.h"
 
 const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15;
-// BENTO JOINT COUNT LIMIT
+// BENTO JOINT COUNT LIMIT - need to set this to final skeleton size + 2
 const U32 LL_CHARACTER_MAX_JOINTS = 152; // must be divisible by 4!
 const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 110;
 
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index c7eaba412d..ab38973dfe 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1259,8 +1259,6 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
 								name = mJointMap[name];
 							}
 							model->mSkinInfo.mJointNames.push_back(name);
-                            // BENTO this does not appear to be used anywhere.
-							// model->mSkinInfo.mJointMap[name] = j;
 						}
 					}
 					else
@@ -1278,8 +1276,6 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
 									name = mJointMap[name];
 								}
 								model->mSkinInfo.mJointNames.push_back(name);
-                                // BENTO not used?
-								// model->mSkinInfo.mJointMap[name] = j;
 							}
 						}
 					}
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 56844ac16d..5f98942340 100755
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -47,8 +47,6 @@ public:
 	std::vector<LLMatrix4> mInvBindMatrix;
 	std::vector<LLMatrix4> mAlternateBindMatrix;
     std::vector<U32> mJointRemap;
-    // BENTO not used?
-	//std::map<std::string, U32> mJointMap;
 
 	LLMeshSkinInfo() { }
 	LLMeshSkinInfo(LLSD& data);
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp
index 4f974d5912..c32345cbe9 100644
--- a/indra/newview/llskinningutil.cpp
+++ b/indra/newview/llskinningutil.cpp
@@ -85,9 +85,7 @@ U32 get_proxy_joint_index(U32 joint_index, LLVOAvatar *avatar, std::vector<std::
     U32 j_proxy = get_valid_joint_index(joint_names[joint_index], avatar, joint_names);
     LLJoint *joint = avatar->getJoint(joint_names[j_proxy]);
     llassert(joint);
-    // BENTO - test of simple push-to-base-ancestor
-    // complexity reduction scheme.  Find the first
-    // ancestor that's not flagged as extended, or the
+    // Find the first ancestor that's not flagged as extended, or the
     // last ancestor that's rigged in this mesh, whichever
     // comes first.
     while (1)
-- 
cgit v1.2.3