Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev

1 files changed, 47 insertions, 47 deletions

diff --git a/indra/newview/lldynamictexture.h b/indra/newview/lldynamictexture.h
index e2ae1090bc..375828fefa 100644
--- a/indra/newview/lldynamictexture.h
+++ b/indra/newview/lldynamictexture.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lldynamictexture.h
  * @brief Implementation of LLViewerDynamicTexture class
  *
  * $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$
  */
@@ -38,65 +38,65 @@ class LLViewerDynamicTexture : public LLViewerTexture
     LL_ALIGN_NEW
 public:
 
-	enum
-	{
-		LL_VIEWER_DYNAMIC_TEXTURE = LLViewerTexture::DYNAMIC_TEXTURE,
-		LL_TEX_LAYER_SET_BUFFER = LLViewerTexture::INVALID_TEXTURE_TYPE + 1,
-		LL_VISUAL_PARAM_HINT,
-		LL_VISUAL_PARAM_RESET,
-		LL_PREVIEW_ANIMATION,
-		LL_IMAGE_PREVIEW_SCULPTED,
-		LL_IMAGE_PREVIEW_AVATAR,
-		INVALID_DYNAMIC_TEXTURE
-	};
+    enum
+    {
+        LL_VIEWER_DYNAMIC_TEXTURE = LLViewerTexture::DYNAMIC_TEXTURE,
+        LL_TEX_LAYER_SET_BUFFER = LLViewerTexture::INVALID_TEXTURE_TYPE + 1,
+        LL_VISUAL_PARAM_HINT,
+        LL_VISUAL_PARAM_RESET,
+        LL_PREVIEW_ANIMATION,
+        LL_IMAGE_PREVIEW_SCULPTED,
+        LL_IMAGE_PREVIEW_AVATAR,
+        INVALID_DYNAMIC_TEXTURE
+    };
 
 protected:
-	/*virtual*/ ~LLViewerDynamicTexture();
+    /*virtual*/ ~LLViewerDynamicTexture();
 
 public:
-	enum EOrder { ORDER_FIRST = 0, ORDER_MIDDLE = 1, ORDER_LAST = 2, ORDER_RESET = 3, ORDER_COUNT = 4 };
+    enum EOrder { ORDER_FIRST = 0, ORDER_MIDDLE = 1, ORDER_LAST = 2, ORDER_RESET = 3, ORDER_COUNT = 4 };
 
-	LLViewerDynamicTexture(S32 width,
-					 S32 height,
-					 S32 components,		// = 4,
-					 EOrder order,			// = ORDER_MIDDLE,
-					 bool clamp);
-	
-	/*virtual*/ S8 getType() const ;
+    LLViewerDynamicTexture(S32 width,
+                     S32 height,
+                     S32 components,        // = 4,
+                     EOrder order,          // = ORDER_MIDDLE,
+                     bool clamp);
 
-	S32			getOriginX() const	{ return mOrigin.mX; }
-	S32			getOriginY() const	{ return mOrigin.mY; }
-	
-	S32			getSize()		{ return mFullWidth * mFullHeight * mComponents; }
+    /*virtual*/ S8 getType() const ;
 
-	virtual bool needsRender() { return true; }
-	virtual void preRender(bool clear_depth = true);
-	virtual bool render();
-	virtual void postRender(bool success);
+    S32         getOriginX() const  { return mOrigin.mX; }
+    S32         getOriginY() const  { return mOrigin.mY; }
 
-	virtual void restoreGLTexture() {}
-	virtual void destroyGLTexture() {}
+    S32         getSize()       { return mFullWidth * mFullHeight * mComponents; }
 
-	static bool	updateAllInstances();
-	static void destroyGL() ;
-	static void restoreGL() ;
+    virtual bool needsRender() { return true; }
+    virtual void preRender(bool clear_depth = true);
+    virtual bool render();
+    virtual void postRender(bool success);
+
+    virtual void restoreGLTexture() {}
+    virtual void destroyGLTexture() {}
+
+    static bool updateAllInstances();
+    static void destroyGL() ;
+    static void restoreGL() ;
 
     void setBoundTarget(LLRenderTarget* target) { mBoundTarget = target; }
 
 protected:
-	void generateGLTexture();
-	void generateGLTexture(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, bool swap_bytes = false);
+    void generateGLTexture();
+    void generateGLTexture(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, bool swap_bytes = false);
 
 protected:
-	bool mClamp;
-	LLCoordGL mOrigin;
-	LL_ALIGN_16(LLCamera mCamera);
-	
+    bool mClamp;
+    LLCoordGL mOrigin;
+    LL_ALIGN_16(LLCamera mCamera);
+
     LLRenderTarget* mBoundTarget;
 
-	typedef std::set<LLViewerDynamicTexture*> instance_list_t;
-	static instance_list_t sInstances[ LLViewerDynamicTexture::ORDER_COUNT ];
-	static S32 sNumRenders;
+    typedef std::set<LLViewerDynamicTexture*> instance_list_t;
+    static instance_list_t sInstances[ LLViewerDynamicTexture::ORDER_COUNT ];
+    static S32 sNumRenders;
 };
 
 #endif