Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 59 insertions, 59 deletions

diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h
index ff78c6c60a..3160b9e706 100644
--- a/indra/newview/lldrawpoolavatar.h
+++ b/indra/newview/lldrawpoolavatar.h
@@ -1,25 +1,25 @@
- /** 
+ /**
  * @file lldrawpoolavatar.h
  * @brief LLDrawPoolAvatar class definition
  *
  * $LicenseInfo:firstyear=2002&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,68 +44,68 @@ extern U32 gFrameCount;
 class LLDrawPoolAvatar : public LLFacePool
 {
 public:
-	enum
-	{
-		SHADER_LEVEL_BUMP = 2,
-		SHADER_LEVEL_CLOTH = 3
-	};
-	
-	enum
-	{
-		VERTEX_DATA_MASK =	LLVertexBuffer::MAP_VERTEX |
-							LLVertexBuffer::MAP_NORMAL |
-							LLVertexBuffer::MAP_TEXCOORD0 |
-							LLVertexBuffer::MAP_WEIGHT |
-							LLVertexBuffer::MAP_CLOTHWEIGHT
-	};
+    enum
+    {
+        SHADER_LEVEL_BUMP = 2,
+        SHADER_LEVEL_CLOTH = 3
+    };
+
+    enum
+    {
+        VERTEX_DATA_MASK =  LLVertexBuffer::MAP_VERTEX |
+                            LLVertexBuffer::MAP_NORMAL |
+                            LLVertexBuffer::MAP_TEXCOORD0 |
+                            LLVertexBuffer::MAP_WEIGHT |
+                            LLVertexBuffer::MAP_CLOTHWEIGHT
+    };
 
     ~LLDrawPoolAvatar();
     /*virtual*/ BOOL isDead();
 
 typedef enum
-	{
-		SHADOW_PASS_AVATAR_OPAQUE,
+    {
+        SHADOW_PASS_AVATAR_OPAQUE,
         SHADOW_PASS_AVATAR_ALPHA_BLEND,
         SHADOW_PASS_AVATAR_ALPHA_MASK,
         NUM_SHADOW_PASSES
-	} eShadowPass;
+    } eShadowPass;
+
+    virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+
+    virtual S32 getShaderLevel() const;
 
-	virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+    LLDrawPoolAvatar(U32 type);
 
-	virtual S32 getShaderLevel() const;
+    static LLMatrix4& getModelView();
 
-	LLDrawPoolAvatar(U32 type);
+    /*virtual*/ S32  getNumPasses();
+    /*virtual*/ void beginRenderPass(S32 pass);
+    /*virtual*/ void endRenderPass(S32 pass);
+    /*virtual*/ void prerender();
+    /*virtual*/ void render(S32 pass = 0);
 
-	static LLMatrix4& getModelView();
+    /*virtual*/ S32 getNumDeferredPasses();
+    /*virtual*/ void beginDeferredPass(S32 pass);
+    /*virtual*/ void endDeferredPass(S32 pass);
+    /*virtual*/ void renderDeferred(S32 pass);
 
-	/*virtual*/ S32  getNumPasses();
-	/*virtual*/ void beginRenderPass(S32 pass);
-	/*virtual*/ void endRenderPass(S32 pass);
-	/*virtual*/ void prerender();
-	/*virtual*/ void render(S32 pass = 0);
+    /*virtual*/ S32 getNumPostDeferredPasses();
+    /*virtual*/ void beginPostDeferredPass(S32 pass);
+    /*virtual*/ void endPostDeferredPass(S32 pass);
+    /*virtual*/ void renderPostDeferred(S32 pass);
 
-	/*virtual*/ S32 getNumDeferredPasses();
-	/*virtual*/ void beginDeferredPass(S32 pass);
-	/*virtual*/ void endDeferredPass(S32 pass);
-	/*virtual*/ void renderDeferred(S32 pass);
-	
-	/*virtual*/ S32 getNumPostDeferredPasses();
-	/*virtual*/ void beginPostDeferredPass(S32 pass);
-	/*virtual*/ void endPostDeferredPass(S32 pass);
-	/*virtual*/ void renderPostDeferred(S32 pass);
+    /*virtual*/ S32 getNumShadowPasses();
+    /*virtual*/ void beginShadowPass(S32 pass);
+    /*virtual*/ void endShadowPass(S32 pass);
+    /*virtual*/ void renderShadow(S32 pass);
 
-	/*virtual*/ S32 getNumShadowPasses();
-	/*virtual*/ void beginShadowPass(S32 pass);
-	/*virtual*/ void endShadowPass(S32 pass);
-	/*virtual*/ void renderShadow(S32 pass);
+    void beginRigid();
+    void beginImpostor();
+    void beginSkinned();
 
-	void beginRigid();
-	void beginImpostor();
-	void beginSkinned();
-	
-	void endRigid();
-	void endImpostor();
-	void endSkinned();
+    void endRigid();
+    void endImpostor();
+    void endSkinned();
 
     void beginDeferredRigid();
     void beginDeferredImpostor();
@@ -115,18 +115,18 @@ typedef enum
     void endDeferredImpostor();
     void endDeferredSkinned();
 
-	/*virtual*/ LLViewerTexture *getDebugTexture();
-	/*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
+    /*virtual*/ LLViewerTexture *getDebugTexture();
+    /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
 
-	void renderAvatars(LLVOAvatar *single_avatar, S32 pass = -1); // renders only one avatar if single_avatar is not null.
+    void renderAvatars(LLVOAvatar *single_avatar, S32 pass = -1); // renders only one avatar if single_avatar is not null.
 
-	static BOOL sSkipOpaque;
-	static BOOL sSkipTransparent;
+    static BOOL sSkipOpaque;
+    static BOOL sSkipTransparent;
     static S32  sShadowPass;
-	static S32 sDiffuseChannel;
-	static F32 sMinimumAlpha;
+    static S32 sDiffuseChannel;
+    static F32 sMinimumAlpha;
 
-	static LLGLSLShader* sVertexProgram;
+    static LLGLSLShader* sVertexProgram;
 };
 
 extern S32 AVATAR_OFFSET_POS;