Merge branch 'spaces-merge' into roxie/webrtc-voice

1 files changed, 211 insertions, 211 deletions

diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h
index 6d56d59e8c..b186b9052e 100644
--- a/indra/llcharacter/llcharacter.h
+++ b/indra/llcharacter/llcharacter.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llcharacter.h
  * @brief Implementation of LLCharacter 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,7 +44,7 @@ class LLPolyMesh;
 class LLPauseRequestHandle : public LLThreadSafeRefCount
 {
 public:
-	LLPauseRequestHandle() {};
+    LLPauseRequestHandle() {};
 };
 
 typedef LLPointer<LLPauseRequestHandle> LLAnimPauseRequest;
@@ -55,236 +55,236 @@ typedef LLPointer<LLPauseRequestHandle> LLAnimPauseRequest;
 class LLCharacter
 {
 public:
-	// Constructor
-	LLCharacter();
+    // Constructor
+    LLCharacter();
+
+    // Destructor
+    virtual ~LLCharacter();
+
+    //-------------------------------------------------------------------------
+    // LLCharacter Interface
+    // These functions must be implemented by subclasses.
+    //-------------------------------------------------------------------------
+
+    // get the prefix to be used to lookup motion data files
+    // from the viewer data directory
+    virtual const char *getAnimationPrefix() = 0;
+
+    // get the root joint of the character
+    virtual LLJoint *getRootJoint() = 0;
+
+    // get the specified joint
+    // default implementation does recursive search,
+    // subclasses may optimize/cache results.
+    virtual LLJoint *getJoint( const std::string &name );
+
+    // get the position of the character
+    virtual LLVector3 getCharacterPosition() = 0;
+
+    // get the rotation of the character
+    virtual LLQuaternion getCharacterRotation() = 0;
+
+    // get the velocity of the character
+    virtual LLVector3 getCharacterVelocity() = 0;
+
+    // get the angular velocity of the character
+    virtual LLVector3 getCharacterAngularVelocity() = 0;
+
+    // get the height & normal of the ground under a point
+    virtual void getGround(const LLVector3 &inPos, LLVector3 &outPos, LLVector3 &outNorm) = 0;
+
+    // skeleton joint accessor to support joint subclasses
+    virtual LLJoint *getCharacterJoint( U32 i ) = 0;
+
+    // get the physics time dilation for the simulator
+    virtual F32 getTimeDilation() = 0;
+
+    // gets current pixel area of this character
+    virtual F32 getPixelArea() const = 0;
+
+    // gets the head mesh of the character
+    virtual LLPolyMesh* getHeadMesh() = 0;
+
+    // gets the upper body mesh of the character
+    virtual LLPolyMesh* getUpperBodyMesh() = 0;
+
+    // gets global coordinates from agent local coordinates
+    virtual LLVector3d  getPosGlobalFromAgent(const LLVector3 &position) = 0;
+
+    // gets agent local coordinates from global coordinates
+    virtual LLVector3   getPosAgentFromGlobal(const LLVector3d &position) = 0;
+
+    // updates all visual parameters for this character
+    virtual void updateVisualParams();
+
+    virtual void addDebugText( const std::string& text ) = 0;
+
+    virtual const LLUUID&   getID() const = 0;
+    //-------------------------------------------------------------------------
+    // End Interface
+    //-------------------------------------------------------------------------
+    // registers a motion with the character
+    // returns true if successfull
+    BOOL registerMotion( const LLUUID& id, LLMotionConstructor create );
+
+    void removeMotion( const LLUUID& id );
+
+    // returns an instance of a registered motion, creating one if necessary
+    LLMotion* createMotion( const LLUUID &id );
+
+    // returns an existing instance of a registered motion
+    LLMotion* findMotion( const LLUUID &id );
+
+    // start a motion
+    // returns true if successful, false if an error occurred
+    virtual BOOL startMotion( const LLUUID& id, F32 start_offset = 0.f);
+
+    // stop a motion
+    virtual BOOL stopMotion( const LLUUID& id, BOOL stop_immediate = FALSE );
+
+    // is this motion active?
+    BOOL isMotionActive( const LLUUID& id );
+
+    // Event handler for motion deactivation.
+    // Called when a motion has completely stopped and has been deactivated.
+    // Subclasses may optionally override this.
+    // The default implementation does nothing.
+    virtual void requestStopMotion( LLMotion* motion );
+
+    // periodic update function, steps the motion controller
+    enum e_update_t { NORMAL_UPDATE, HIDDEN_UPDATE, FORCE_UPDATE };
+    void updateMotions(e_update_t update_type);
+
+    LLAnimPauseRequest requestPause();
+    BOOL areAnimationsPaused() const { return mMotionController.isPaused(); }
+    void setAnimTimeFactor(F32 factor) { mMotionController.setTimeFactor(factor); }
+    void setTimeStep(F32 time_step) { mMotionController.setTimeStep(time_step); }
+
+    LLMotionController& getMotionController() { return mMotionController; }
+
+    // Releases all motion instances which should result in
+    // no cached references to character joint data.  This is
+    // useful if a character wants to rebuild it's skeleton.
+    virtual void flushAllMotions();
+
+    // Flush only wipes active animations.
+    virtual void deactivateAllMotions();
 
-	// Destructor
-	virtual ~LLCharacter();
+    // dumps information for debugging
+    virtual void dumpCharacter( LLJoint *joint = NULL );
 
-	//-------------------------------------------------------------------------
-	// LLCharacter Interface
-	// These functions must be implemented by subclasses.
-	//-------------------------------------------------------------------------
+    virtual F32 getPreferredPelvisHeight() { return mPreferredPelvisHeight; }
 
-	// get the prefix to be used to lookup motion data files
-	// from the viewer data directory
-	virtual const char *getAnimationPrefix() = 0;
+    virtual LLVector3 getVolumePos(S32 joint_index, LLVector3& volume_offset) { return LLVector3::zero; }
 
-	// get the root joint of the character
-	virtual LLJoint *getRootJoint() = 0;
+    virtual LLJoint* findCollisionVolume(S32 volume_id) { return NULL; }
 
-	// get the specified joint
-	// default implementation does recursive search,
-	// subclasses may optimize/cache results.
-	virtual LLJoint *getJoint( const std::string &name );
+    virtual S32 getCollisionVolumeID(std::string &name) { return -1; }
 
-	// get the position of the character
-	virtual LLVector3 getCharacterPosition() = 0;
+    void setAnimationData(std::string name, void *data);
 
-	// get the rotation of the character
-	virtual LLQuaternion getCharacterRotation() = 0;
+    void *getAnimationData(std::string name);
 
-	// get the velocity of the character
-	virtual LLVector3 getCharacterVelocity() = 0;
+    void removeAnimationData(std::string name);
 
-	// get the angular velocity of the character
-	virtual LLVector3 getCharacterAngularVelocity() = 0;
+    void addVisualParam(LLVisualParam *param);
+    void addSharedVisualParam(LLVisualParam *param);
 
-	// get the height & normal of the ground under a point
-	virtual void getGround(const LLVector3 &inPos, LLVector3 &outPos, LLVector3 &outNorm) = 0;
+    virtual BOOL setVisualParamWeight(const LLVisualParam *which_param, F32 weight);
+    virtual BOOL setVisualParamWeight(const char* param_name, F32 weight);
+    virtual BOOL setVisualParamWeight(S32 index, F32 weight);
 
-	// skeleton joint accessor to support joint subclasses
-	virtual LLJoint *getCharacterJoint( U32 i ) = 0;
+    // get visual param weight by param or name
+    F32 getVisualParamWeight(LLVisualParam *distortion);
+    F32 getVisualParamWeight(const char* param_name);
+    F32 getVisualParamWeight(S32 index);
 
-	// get the physics time dilation for the simulator
-	virtual F32 getTimeDilation() = 0;
+    // set all morph weights to defaults
+    void clearVisualParamWeights();
 
-	// gets current pixel area of this character
-	virtual F32 getPixelArea() const = 0;
+    // visual parameter accessors
+    LLVisualParam*  getFirstVisualParam()
+    {
+        mCurIterator = mVisualParamIndexMap.begin();
+        return getNextVisualParam();
+    }
+    LLVisualParam*  getNextVisualParam()
+    {
+        if (mCurIterator == mVisualParamIndexMap.end())
+            return 0;
+        return (mCurIterator++)->second;
+    }
 
-	// gets the head mesh of the character
-	virtual LLPolyMesh*	getHeadMesh() = 0;
+    S32 getVisualParamCountInGroup(const EVisualParamGroup group) const
+    {
+        S32 rtn = 0;
+        for (const visual_param_index_map_t::value_type& index_pair : mVisualParamIndexMap)
+        {
+            if (index_pair.second->getGroup() == group)
+            {
+                ++rtn;
+            }
+        }
+        return rtn;
+    }
 
-	// gets the upper body mesh of the character
-	virtual LLPolyMesh*	getUpperBodyMesh() = 0;
+    LLVisualParam*  getVisualParam(S32 id) const
+    {
+        visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.find(id);
+        return (iter == mVisualParamIndexMap.end()) ? 0 : iter->second;
+    }
+    S32 getVisualParamID(LLVisualParam *id)
+    {
+        for (visual_param_index_map_t::value_type& index_pair : mVisualParamIndexMap)
+        {
+            if (index_pair.second == id)
+                return index_pair.first;
+        }
+        return 0;
+    }
+    S32             getVisualParamCount() const { return (S32)mVisualParamIndexMap.size(); }
+    LLVisualParam*  getVisualParam(const char *name);
+
+
+    ESex getSex() const         { return mSex; }
+    void setSex( ESex sex )     { mSex = sex; }
+
+    U32             getAppearanceSerialNum() const      { return mAppearanceSerialNum; }
+    void            setAppearanceSerialNum( U32 num )   { mAppearanceSerialNum = num; }
+
+    U32             getSkeletonSerialNum() const        { return mSkeletonSerialNum; }
+    void            setSkeletonSerialNum( U32 num ) { mSkeletonSerialNum = num; }
 
-	// gets global coordinates from agent local coordinates
-	virtual LLVector3d	getPosGlobalFromAgent(const LLVector3 &position) = 0;
-
-	// gets agent local coordinates from global coordinates
-	virtual LLVector3	getPosAgentFromGlobal(const LLVector3d &position) = 0;
-
-	// updates all visual parameters for this character
-	virtual void updateVisualParams();
-
-	virtual void addDebugText( const std::string& text ) = 0;
-
-	virtual const LLUUID&	getID() const = 0;
-	//-------------------------------------------------------------------------
-	// End Interface
-	//-------------------------------------------------------------------------
-	// registers a motion with the character
-	// returns true if successfull
-	BOOL registerMotion( const LLUUID& id, LLMotionConstructor create );
-
-	void removeMotion( const LLUUID& id );
-
-	// returns an instance of a registered motion, creating one if necessary
-	LLMotion* createMotion( const LLUUID &id );
-
-	// returns an existing instance of a registered motion
-	LLMotion* findMotion( const LLUUID &id );
-	
-	// start a motion
-	// returns true if successful, false if an error occurred
-	virtual BOOL startMotion( const LLUUID& id, F32 start_offset = 0.f);
-
-	// stop a motion
-	virtual BOOL stopMotion( const LLUUID& id, BOOL stop_immediate = FALSE );
-
-	// is this motion active?
-	BOOL isMotionActive( const LLUUID& id );
-
-	// Event handler for motion deactivation.
-	// Called when a motion has completely stopped and has been deactivated.
-	// Subclasses may optionally override this.
-	// The default implementation does nothing.
-	virtual void requestStopMotion( LLMotion* motion );
-	
-	// periodic update function, steps the motion controller
-	enum e_update_t { NORMAL_UPDATE, HIDDEN_UPDATE, FORCE_UPDATE };
-	void updateMotions(e_update_t update_type);
-
-	LLAnimPauseRequest requestPause();
-	BOOL areAnimationsPaused() const { return mMotionController.isPaused(); }
-	void setAnimTimeFactor(F32 factor) { mMotionController.setTimeFactor(factor); }
-	void setTimeStep(F32 time_step) { mMotionController.setTimeStep(time_step); }
-
-	LLMotionController& getMotionController() { return mMotionController; }
-	
-	// Releases all motion instances which should result in
-	// no cached references to character joint data.  This is 
-	// useful if a character wants to rebuild it's skeleton.
-	virtual void flushAllMotions();
-	
-	// Flush only wipes active animations. 
-	virtual void deactivateAllMotions();
-
-	// dumps information for debugging
-	virtual void dumpCharacter( LLJoint *joint = NULL );
-
-	virtual F32 getPreferredPelvisHeight() { return mPreferredPelvisHeight; }
-
-	virtual LLVector3 getVolumePos(S32 joint_index, LLVector3& volume_offset) { return LLVector3::zero; }
-	
-	virtual LLJoint* findCollisionVolume(S32 volume_id) { return NULL; }
-
-	virtual S32 getCollisionVolumeID(std::string &name) { return -1; }
-
-	void setAnimationData(std::string name, void *data);
-	
-	void *getAnimationData(std::string name);
-
-	void removeAnimationData(std::string name);
-	
-	void addVisualParam(LLVisualParam *param);
-	void addSharedVisualParam(LLVisualParam *param);
-
-	virtual BOOL setVisualParamWeight(const LLVisualParam *which_param, F32 weight);
-	virtual BOOL setVisualParamWeight(const char* param_name, F32 weight);
-	virtual BOOL setVisualParamWeight(S32 index, F32 weight);
-
-	// get visual param weight by param or name
-	F32 getVisualParamWeight(LLVisualParam *distortion);
-	F32 getVisualParamWeight(const char* param_name);
-	F32 getVisualParamWeight(S32 index);
-
-	// set all morph weights to defaults
-	void clearVisualParamWeights();
-
-	// visual parameter accessors
-	LLVisualParam*	getFirstVisualParam()
-	{
-		mCurIterator = mVisualParamIndexMap.begin();
-		return getNextVisualParam();
-	}
-	LLVisualParam*	getNextVisualParam()
-	{
-		if (mCurIterator == mVisualParamIndexMap.end())
-			return 0;
-		return (mCurIterator++)->second;
-	}
-
-	S32 getVisualParamCountInGroup(const EVisualParamGroup group) const
-	{
-		S32 rtn = 0;
-		for (const visual_param_index_map_t::value_type& index_pair : mVisualParamIndexMap)
-		{
-			if (index_pair.second->getGroup() == group)
-			{
-				++rtn;
-			}
-		}
-		return rtn;
-	}
-
-	LLVisualParam*	getVisualParam(S32 id) const
-	{
-		visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.find(id);
-		return (iter == mVisualParamIndexMap.end()) ? 0 : iter->second;
-	}
-	S32 getVisualParamID(LLVisualParam *id)
-	{
-		for (visual_param_index_map_t::value_type& index_pair : mVisualParamIndexMap)
-		{
-			if (index_pair.second == id)
-				return index_pair.first;
-		}
-		return 0;
-	}
-	S32				getVisualParamCount() const { return (S32)mVisualParamIndexMap.size(); }
-	LLVisualParam*	getVisualParam(const char *name);
-
-
-	ESex getSex() const			{ return mSex; }
-	void setSex( ESex sex )		{ mSex = sex; }
-
-	U32				getAppearanceSerialNum() const		{ return mAppearanceSerialNum; }
-	void			setAppearanceSerialNum( U32 num )	{ mAppearanceSerialNum = num; }
-	
-	U32				getSkeletonSerialNum() const		{ return mSkeletonSerialNum; }
-	void			setSkeletonSerialNum( U32 num )	{ mSkeletonSerialNum = num; }
-
-	static std::vector< LLCharacter* > sInstances;
-	static BOOL sAllowInstancesChange ; //debug use
-
-	virtual void	setHoverOffset(const LLVector3& hover_offset, bool send_update=true) { mHoverOffset = hover_offset; }
-	const LLVector3& getHoverOffset() const { return mHoverOffset; }
+    static std::vector< LLCharacter* > sInstances;
+    static BOOL sAllowInstancesChange ; //debug use
+
+    virtual void    setHoverOffset(const LLVector3& hover_offset, bool send_update=true) { mHoverOffset = hover_offset; }
+    const LLVector3& getHoverOffset() const { return mHoverOffset; }
 
 protected:
-	LLMotionController	mMotionController;
+    LLMotionController  mMotionController;
 
-	typedef std::map<std::string, void *> animation_data_map_t;
-	animation_data_map_t mAnimationData;
+    typedef std::map<std::string, void *> animation_data_map_t;
+    animation_data_map_t mAnimationData;
 
-	F32					mPreferredPelvisHeight;
-	ESex				mSex;
-	U32					mAppearanceSerialNum;
-	U32					mSkeletonSerialNum;
-	LLAnimPauseRequest	mPauseRequest;
+    F32                 mPreferredPelvisHeight;
+    ESex                mSex;
+    U32                 mAppearanceSerialNum;
+    U32                 mSkeletonSerialNum;
+    LLAnimPauseRequest  mPauseRequest;
 
 private:
-	// visual parameter stuff
-	typedef std::map<S32, LLVisualParam *> 		visual_param_index_map_t;
-	typedef std::map<char *, LLVisualParam *> 	visual_param_name_map_t;
+    // visual parameter stuff
+    typedef std::map<S32, LLVisualParam *>      visual_param_index_map_t;
+    typedef std::map<char *, LLVisualParam *>   visual_param_name_map_t;
 
-	visual_param_index_map_t::iterator 			mCurIterator;
-	visual_param_index_map_t 					mVisualParamIndexMap;
-	visual_param_name_map_t  					mVisualParamNameMap;
+    visual_param_index_map_t::iterator          mCurIterator;
+    visual_param_index_map_t                    mVisualParamIndexMap;
+    visual_param_name_map_t                     mVisualParamNameMap;
 
-	static LLStringTable sVisualParamNames;	
+    static LLStringTable sVisualParamNames;
 
-	LLVector3 mHoverOffset;
+    LLVector3 mHoverOffset;
 };
 
 #endif // LL_LLCHARACTER_H