Merge pull request #1528 from secondlife/brad/merge-maint-a-to-dev

merge maint-a (including maint-x) into gltf_development

1 files changed, 67 insertions, 67 deletions

diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h
index d43956e120..f2032220e0 100644
--- a/indra/llcharacter/llpose.h
+++ b/indra/llcharacter/llpose.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpose.h
  * @brief Implementation of LLPose class.
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -44,38 +44,38 @@
 //-----------------------------------------------------------------------------
 class LLPose
 {
-	friend class LLPoseBlender;
+    friend class LLPoseBlender;
 protected:
-	typedef std::map<std::string, LLPointer<LLJointState> > joint_map;
-	typedef joint_map::iterator joint_map_iterator;
-	typedef joint_map::value_type joint_map_value_type;
-	
-	joint_map					mJointMap;
-	F32							mWeight;
-	joint_map_iterator			mListIter;
+    typedef std::map<std::string, LLPointer<LLJointState> > joint_map;
+    typedef joint_map::iterator joint_map_iterator;
+    typedef joint_map::value_type joint_map_value_type;
+
+    joint_map                   mJointMap;
+    F32                         mWeight;
+    joint_map_iterator          mListIter;
 public:
-	// Iterate through jointStates
-	LLJointState* getFirstJointState();
-	LLJointState* getNextJointState();
-	LLJointState* findJointState(LLJoint *joint);
-	LLJointState* findJointState(const std::string &name);
+    // Iterate through jointStates
+    LLJointState* getFirstJointState();
+    LLJointState* getNextJointState();
+    LLJointState* findJointState(LLJoint *joint);
+    LLJointState* findJointState(const std::string &name);
 public:
-	// Constructor
-	LLPose() : mWeight(0.f) {}
-	// Destructor
-	~LLPose();
-	// add a joint state in this pose
-	bool addJointState(const LLPointer<LLJointState>& jointState);
-	// remove a joint state from this pose
-	bool removeJointState(const LLPointer<LLJointState>& jointState);
-	// removes all joint states from this pose
-	bool removeAllJointStates();
-	// set weight for all joint states in this pose
-	void setWeight(F32 weight);
-	// get weight for this pose
-	F32 getWeight() const;
-	// returns number of joint states stored in this pose
-	S32 getNumJointStates() const;
+    // Constructor
+    LLPose() : mWeight(0.f) {}
+    // Destructor
+    ~LLPose();
+    // add a joint state in this pose
+    bool addJointState(const LLPointer<LLJointState>& jointState);
+    // remove a joint state from this pose
+    bool removeJointState(const LLPointer<LLJointState>& jointState);
+    // removes all joint states from this pose
+    bool removeAllJointStates();
+    // set weight for all joint states in this pose
+    void setWeight(F32 weight);
+    // get weight for this pose
+    F32 getWeight() const;
+    // returns number of joint states stored in this pose
+    S32 getNumJointStates() const;
 };
 
 const S32 JSB_NUM_JOINT_STATES = 6;
@@ -85,20 +85,20 @@ class LLJointStateBlender
 {
     LL_ALIGN_NEW
 protected:
-	LLPointer<LLJointState>	mJointStates[JSB_NUM_JOINT_STATES];
-	S32				mPriorities[JSB_NUM_JOINT_STATES];
-	bool			mAdditiveBlends[JSB_NUM_JOINT_STATES];
+    LLPointer<LLJointState> mJointStates[JSB_NUM_JOINT_STATES];
+    S32             mPriorities[JSB_NUM_JOINT_STATES];
+    bool            mAdditiveBlends[JSB_NUM_JOINT_STATES];
 public:
-	LLJointStateBlender();
-	~LLJointStateBlender();
-	void blendJointStates(bool apply_now = true);
-	bool addJointState(const LLPointer<LLJointState>& joint_state, S32 priority, bool additive_blend);
-	void interpolate(F32 u);
-	void clear();
-	void resetCachedJoint();
+    LLJointStateBlender();
+    ~LLJointStateBlender();
+    void blendJointStates(bool apply_now = true);
+    bool addJointState(const LLPointer<LLJointState>& joint_state, S32 priority, bool additive_blend);
+    void interpolate(F32 u);
+    void clear();
+    void resetCachedJoint();
 
 public:
-	LL_ALIGN_16(LLJoint mJointCache);
+    LL_ALIGN_16(LLJoint mJointCache);
 } LL_ALIGN_POSTFIX(16);
 
 class LLMotion;
@@ -106,35 +106,35 @@ class LLMotion;
 class LLPoseBlender
 {
 protected:
-	typedef std::list<LLJointStateBlender*> blender_list_t;
-	typedef std::map<LLJoint*,LLJointStateBlender*> blender_map_t;
-	blender_map_t mJointStateBlenderPool;
-	blender_list_t mActiveBlenders;
+    typedef std::list<LLJointStateBlender*> blender_list_t;
+    typedef std::map<LLJoint*,LLJointStateBlender*> blender_map_t;
+    blender_map_t mJointStateBlenderPool;
+    blender_list_t mActiveBlenders;
 
-	S32			mNextPoseSlot;
-	LLPose		mBlendedPose;
+    S32         mNextPoseSlot;
+    LLPose      mBlendedPose;
 public:
-	// Constructor
-	LLPoseBlender();
-	// Destructor
-	~LLPoseBlender();
-	
-	// request motion joint states to be added to pose blender joint state records
-	bool addMotion(LLMotion* motion);
+    // Constructor
+    LLPoseBlender();
+    // Destructor
+    ~LLPoseBlender();
+
+    // request motion joint states to be added to pose blender joint state records
+    bool addMotion(LLMotion* motion);
 
-	// blend all joint states and apply to skeleton
-	void blendAndApply();
+    // blend all joint states and apply to skeleton
+    void blendAndApply();
 
-	// removes all joint state blenders from last time
-	void clearBlenders();
+    // removes all joint state blenders from last time
+    void clearBlenders();
 
-	// blend all joint states and cache results
-	void blendAndCache(bool reset_cached_joints);
+    // blend all joint states and cache results
+    void blendAndCache(bool reset_cached_joints);
 
-	// interpolate all joints towards cached values
-	void interpolate(F32 u);
+    // interpolate all joints towards cached values
+    void interpolate(F32 u);
 
-	LLPose* getBlendedPose() { return &mBlendedPose; }
+    LLPose* getBlendedPose() { return &mBlendedPose; }
 };
 
 #endif // LL_LLPOSE_H