Merge pull request #1373 from secondlife/marchcat/x-ws-merge

1 files changed, 29 insertions, 29 deletions

diff --git a/indra/newview/lldrawpoolalpha.h b/indra/newview/lldrawpoolalpha.h
index 820c4f4e68..a968149a22 100644
--- a/indra/newview/lldrawpoolalpha.h
+++ b/indra/newview/lldrawpoolalpha.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lldrawpoolalpha.h
  * @brief LLDrawPoolAlpha 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$
  */
@@ -42,36 +42,36 @@ public:
     // set by llsettingsvo so lldrawpoolalpha has quick access to the water plane in eye space
     static LLVector4 sWaterPlane;
 
-	enum
-	{
-		VERTEX_DATA_MASK =	LLVertexBuffer::MAP_VERTEX |
-							LLVertexBuffer::MAP_NORMAL |
-							LLVertexBuffer::MAP_COLOR |
-							LLVertexBuffer::MAP_TEXCOORD0
-	};
-	virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+    enum
+    {
+        VERTEX_DATA_MASK =  LLVertexBuffer::MAP_VERTEX |
+                            LLVertexBuffer::MAP_NORMAL |
+                            LLVertexBuffer::MAP_COLOR |
+                            LLVertexBuffer::MAP_TEXCOORD0
+    };
+    virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
 
-	LLDrawPoolAlpha(U32 type);
-	/*virtual*/ ~LLDrawPoolAlpha();
+    LLDrawPoolAlpha(U32 type);
+    /*virtual*/ ~LLDrawPoolAlpha();
 
-	/*virtual*/ S32 getNumPostDeferredPasses();
-	/*virtual*/ void renderPostDeferred(S32 pass);
-	/*virtual*/ S32	 getNumPasses() { return 1; }
+    /*virtual*/ S32 getNumPostDeferredPasses();
+    /*virtual*/ void renderPostDeferred(S32 pass);
+    /*virtual*/ S32  getNumPasses() { return 1; }
 
     void forwardRender(bool write_depth = false);
-	/*virtual*/ void prerender();
+    /*virtual*/ void prerender();
 
     void renderDebugAlpha();
 
-	void renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE);
-	void renderAlpha(U32 mask, bool depth_only = false, bool rigged = false);
-	void renderAlphaHighlight();
+    void renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE);
+    void renderAlpha(U32 mask, bool depth_only = false, bool rigged = false);
+    void renderAlphaHighlight();
     bool uploadMatrixPalette(const LLDrawInfo& params);
 
-	static BOOL sShowDebugAlpha;
+    static BOOL sShowDebugAlpha;
 
 private:
-	LLGLSLShader* target_shader;
+    LLGLSLShader* target_shader;
 
     // setup by beginFooPass, [0] is static variant, [1] is rigged variant
     LLGLSLShader* simple_shader = nullptr;
@@ -88,11 +88,11 @@ private:
     bool TexSetup(LLDrawInfo* draw, bool use_material);
     void RestoreTexSetup(bool tex_setup);
 
-	// our 'normal' alpha blend function for this pass
-	LLRender::eBlendFactor mColorSFactor;
-	LLRender::eBlendFactor mColorDFactor;	
-	LLRender::eBlendFactor mAlphaSFactor;
-	LLRender::eBlendFactor mAlphaDFactor;
+    // our 'normal' alpha blend function for this pass
+    LLRender::eBlendFactor mColorSFactor;
+    LLRender::eBlendFactor mColorDFactor;
+    LLRender::eBlendFactor mAlphaSFactor;
+    LLRender::eBlendFactor mAlphaDFactor;
 
     // if true, we're executing a rigged render pass
     bool mRigged = false;