From 5dacf76ae87b6aaac4ae19698f03396a0d19add4 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Sep 2016 12:50:00 +0200 Subject: [PATCH] Fix line endings --- indra/newview/llskinningutil.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp index e9a91a98b5..f1e3284f0c 100644 --- a/indra/newview/llskinningutil.cpp +++ b/indra/newview/llskinningutil.cpp @@ -36,12 +36,12 @@ bool LLSkinningUtil::sIncludeEnhancedSkeleton = true; namespace { -// Query by JointKey rather than just a string, the key can be a U32 index for faster lookup +// Query by JointKey rather than just a string, the key can be a U32 index for faster lookup //bool get_name_index( const std::string& name, std::vector& names, U32& result ) bool get_name_index( const JointKey& name, std::vector& names, U32& result ) // { - // Query by JointKey rather than just a string, the key can be a U32 index for faster lookup + // Query by JointKey rather than just a string, the key can be a U32 index for faster lookup // std::vector::const_iterator find_it = std::vector::const_iterator find_it = // @@ -60,7 +60,7 @@ bool get_name_index( const JointKey& name, std::vector& names, U32& re // Find a name table index that is also a valid joint on the // avatar. Order of preference is: requested name, mPelvis, first // valid match in names table. -// Query by JointKey rather than just a string, the key can be a U32 index for faster lookup +// Query by JointKey rather than just a string, the key can be a U32 index for faster lookup //U32 get_valid_joint_index( const std::string& name, LLVOAvatar *avatar, std::vector& joint_names ) U32 get_valid_joint_index( const JointKey& name, LLVOAvatar *avatar, std::vector& joint_names ) // @@ -70,7 +70,7 @@ U32 get_valid_joint_index( const JointKey& name, LLVOAvatar *avatar, std::vector { return result; } -// Query by JointKey rather than just a string, the key can be a U32 index for faster lookup +// Query by JointKey rather than just a string, the key can be a U32 index for faster lookup // if( get_name_index( "mPelvis", joint_names, result ) ) if( get_name_index( JointKey::construct( "mPelvis" ), joint_names, result ) ) // @@ -90,7 +90,7 @@ U32 get_valid_joint_index( const JointKey& name, LLVOAvatar *avatar, std::vector } // Which joint will stand in for this joint? -// Query by JointKey rather than just a string, the key can be a U32 index for faster lookup +// Query by JointKey rather than just a string, the key can be a U32 index for faster lookup //U32 get_proxy_joint_index( U32 joint_index, LLVOAvatar *avatar, std::vector& joint_names ) U32 get_proxy_joint_index( U32 joint_index, LLVOAvatar *avatar, std::vector& joint_names ) // @@ -110,7 +110,7 @@ U32 get_proxy_joint_index( U32 joint_index, LLVOAvatar *avatar, std::vectorgetParent(); if (!parent) break; - // Query by JointKey rather than just a string, the key can be a U32 index for faster lookup + // Query by JointKey rather than just a string, the key can be a U32 index for faster lookup // if( !get_name_index( parent->getName(), joint_names, j_proxy ) ) if( !get_name_index( JointKey::construct( parent->getName() ), joint_names, j_proxy ) ) // @@ -185,7 +185,7 @@ void LLSkinningUtil::remapSkinInfoJoints(LLVOAvatar *avatar, LLMeshSkinInfo* ski // needed for handling of any legacy bad data. if (!avatar->getJoint(skin->mJointNames[j])) { -// Query by JointKey rather than just a string, the key can be a U32 index for faster lookup +// Query by JointKey rather than just a string, the key can be a U32 index for faster lookup // skin->mJointNames[ j ] = "mPelvis"; skin->mJointNames[ j ] = JointKey::construct( "mPelvis" ); // @@ -223,7 +223,7 @@ void LLSkinningUtil::remapSkinInfoJoints(LLVOAvatar *avatar, LLMeshSkinInfo* ski // Apply the remap to mJointNames, mInvBindMatrix, and mAlternateBindMatrix - // Query by JointKey rather than just a string, the key can be a U32 index for faster lookup + // Query by JointKey rather than just a string, the key can be a U32 index for faster lookup // std::vector new_joint_names; std::vector< JointKey > new_joint_names; //