Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.

1 files changed, 68 insertions, 68 deletions

diff --git a/indra/llappearance/llavatarjointmesh.h b/indra/llappearance/llavatarjointmesh.h
index 5980b29b46..80db7f6f15 100644
--- a/indra/llappearance/llavatarjointmesh.h
+++ b/indra/llappearance/llavatarjointmesh.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llavatarjointmesh.h
  * @brief Declaration of LLAvatarJointMesh 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$
  */
@@ -39,21 +39,21 @@ class LLTexLayerSet;
 
 typedef enum e_avatar_render_pass
 {
-	AVATAR_RENDER_PASS_SINGLE,
-	AVATAR_RENDER_PASS_CLOTHING_INNER,
-	AVATAR_RENDER_PASS_CLOTHING_OUTER
+    AVATAR_RENDER_PASS_SINGLE,
+    AVATAR_RENDER_PASS_CLOTHING_INNER,
+    AVATAR_RENDER_PASS_CLOTHING_OUTER
 } EAvatarRenderPass;
 
 class LLSkinJoint
 {
 public:
-	LLSkinJoint();
-	~LLSkinJoint();
-	BOOL setupSkinJoint( LLAvatarJoint *joint);
+    LLSkinJoint();
+    ~LLSkinJoint();
+    BOOL setupSkinJoint( LLAvatarJoint *joint);
 
-	LLAvatarJoint	*mJoint;
-	LLVector3		mRootToJointSkinOffset;
-	LLVector3		mRootToParentJointSkinOffset;
+    LLAvatarJoint   *mJoint;
+    LLVector3       mRootToJointSkinOffset;
+    LLVector3       mRootToParentJointSkinOffset;
 };
 
 //-----------------------------------------------------------------------------
@@ -62,83 +62,83 @@ public:
 class LLAvatarJointMesh : public virtual LLAvatarJoint
 {
 protected:
-	LLColor4					mColor;			// color value
-// 	LLColor4					mSpecular;		// specular color (always white for now)
-	F32							mShiny;			// shiny value
-	LLPointer<LLGLTexture>		mTexture;		// ptr to a global texture
-	LLTexLayerSet*				mLayerSet;		// ptr to a layer set owned by the avatar
-	U32 						mTestImageName;		// handle to a temporary texture for previewing uploads
-	LLPolyMesh*					mMesh;			// ptr to a global polymesh
-	BOOL						mCullBackFaces;	// true by default
-	LLFace*						mFace;			// ptr to a face w/ AGP copy of mesh
-
-	U32							mFaceIndexCount;
-
-	U32							mNumSkinJoints;
-	LLSkinJoint*				mSkinJoints;
-	S32							mMeshID;
+    LLColor4                    mColor;         // color value
+//  LLColor4                    mSpecular;      // specular color (always white for now)
+    F32                         mShiny;         // shiny value
+    LLPointer<LLGLTexture>      mTexture;       // ptr to a global texture
+    LLTexLayerSet*              mLayerSet;      // ptr to a layer set owned by the avatar
+    U32                         mTestImageName;     // handle to a temporary texture for previewing uploads
+    LLPolyMesh*                 mMesh;          // ptr to a global polymesh
+    BOOL                        mCullBackFaces; // true by default
+    LLFace*                     mFace;          // ptr to a face w/ AGP copy of mesh
+
+    U32                         mFaceIndexCount;
+
+    U32                         mNumSkinJoints;
+    LLSkinJoint*                mSkinJoints;
+    S32                         mMeshID;
 
 public:
-	static BOOL					sPipelineRender;
-	//RN: this is here for testing purposes
-	static U32					sClothingMaskImageName;
-	static LLColor4				sClothingInnerColor;
+    static BOOL                 sPipelineRender;
+    //RN: this is here for testing purposes
+    static U32                  sClothingMaskImageName;
+    static LLColor4             sClothingInnerColor;
 
 public:
-	// Constructor
-	LLAvatarJointMesh();
+    // Constructor
+    LLAvatarJointMesh();
 
-	// Destructor
-	virtual ~LLAvatarJointMesh();
+    // Destructor
+    virtual ~LLAvatarJointMesh();
 
-	// Gets the shape color
-	void getColor( F32 *red, F32 *green, F32 *blue, F32 *alpha );
+    // Gets the shape color
+    void getColor( F32 *red, F32 *green, F32 *blue, F32 *alpha );
 
-	// Sets the shape color
-	void setColor( F32 red, F32 green, F32 blue, F32 alpha );
-	void setColor( const LLColor4& color );
+    // Sets the shape color
+    void setColor( F32 red, F32 green, F32 blue, F32 alpha );
+    void setColor( const LLColor4& color );
 
-	// Sets the shininess
-	void setSpecular( const LLColor4& color, F32 shiny ) { /*mSpecular = color;*/ mShiny = shiny; };
+    // Sets the shininess
+    void setSpecular( const LLColor4& color, F32 shiny ) { /*mSpecular = color;*/ mShiny = shiny; };
 
-	// Sets the shape texture
-	void setTexture( LLGLTexture *texture );
+    // Sets the shape texture
+    void setTexture( LLGLTexture *texture );
 
-	BOOL hasGLTexture() const;
+    BOOL hasGLTexture() const;
 
-	void setTestTexture( U32 name ) { mTestImageName = name; }
+    void setTestTexture( U32 name ) { mTestImageName = name; }
 
-	// Sets layer set responsible for a dynamic shape texture (takes precedence over normal texture)
-	void setLayerSet( LLTexLayerSet* layer_set );
+    // Sets layer set responsible for a dynamic shape texture (takes precedence over normal texture)
+    void setLayerSet( LLTexLayerSet* layer_set );
 
-	BOOL hasComposite() const;
+    BOOL hasComposite() const;
 
-	// Gets the poly mesh
-	LLPolyMesh *getMesh();
+    // Gets the poly mesh
+    LLPolyMesh *getMesh();
 
-	// Sets the poly mesh
-	void setMesh( LLPolyMesh *mesh );
+    // Sets the poly mesh
+    void setMesh( LLPolyMesh *mesh );
 
-	// Sets up joint matrix data for rendering
-	void setupJoint(LLAvatarJoint* current_joint);
+    // Sets up joint matrix data for rendering
+    void setupJoint(LLAvatarJoint* current_joint);
 
-	// Render time method to upload batches of joint matrices
-	void uploadJointMatrices();
+    // Render time method to upload batches of joint matrices
+    void uploadJointMatrices();
 
-	// Sets ID for picking
-	void setMeshID( S32 id ) {mMeshID = id;}
+    // Sets ID for picking
+    void setMeshID( S32 id ) {mMeshID = id;}
 
-	// Gets ID for picking
-	S32 getMeshID() { return mMeshID; }	
+    // Gets ID for picking
+    S32 getMeshID() { return mMeshID; }
 
-	void setIsTransparent(BOOL is_transparent) { mIsTransparent = is_transparent; }
+    void setIsTransparent(BOOL is_transparent) { mIsTransparent = is_transparent; }
 
 private:
-	// Allocate skin data
-	BOOL allocateSkinData( U32 numSkinJoints );
+    // Allocate skin data
+    BOOL allocateSkinData( U32 numSkinJoints );
 
-	// Free skin data
-	void freeSkinData();
+    // Free skin data
+    void freeSkinData();
 };
 
 #endif // LL_LLAVATARJOINTMESH_H