Merge tag '7.1.7-release'

source for viewer 7.1.7.8974243247

1 files changed, 27 insertions, 27 deletions

diff --git a/indra/llrender/lltexture.h b/indra/llrender/lltexture.h
index e890a5a30b..35cded86f2 100644
--- a/indra/llrender/lltexture.h
+++ b/indra/llrender/lltexture.h
@@ -1,30 +1,30 @@
-/** 
+/**
  * @file lltexture.h
  * @brief LLTexture definition
  *
- *	This class acts as a wrapper for OpenGL calls.
- *	The goal of this class is to minimize the number of api calls due to legacy rendering
- *	code, to define an interface for a multiple rendering API abstraction of the UI
- *	rendering, and to abstract out direct rendering calls in a way that is cleaner and easier to maintain.
+ *  This class acts as a wrapper for OpenGL calls.
+ *  The goal of this class is to minimize the number of api calls due to legacy rendering
+ *  code, to define an interface for a multiple rendering API abstraction of the UI
+ *  rendering, and to abstract out direct rendering calls in a way that is cleaner and easier to maintain.
  *
  * $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,32 +44,32 @@ class LLFontGL ;
 //
 class LLTexture : public virtual LLRefCount
 {
-	friend class LLTexUnit ;
-	friend class LLFontGL ;
+    friend class LLTexUnit ;
+    friend class LLFontGL ;
 
 protected:
-	virtual ~LLTexture();
+    virtual ~LLTexture();
 
 public:
-	LLTexture()
-	{}
+    LLTexture()
+    {}
 
-	//
-	//interfaces to access LLGLTexture
-	//
-	virtual S8         getType() const;
-	virtual void       setKnownDrawSize(S32 width, S32 height);
-	virtual bool       bindDefaultImage(const S32 stage = 0);
-	virtual bool       bindDebugImage(const S32 stage = 0);
-	virtual void       forceImmediateUpdate();
-	virtual void       setActive();
-	virtual S32	       getWidth(S32 discard_level = -1) const;
-	virtual S32	       getHeight(S32 discard_level = -1) const;
-	virtual bool       isActiveFetching();
+    //
+    //interfaces to access LLGLTexture
+    //
+    virtual S8         getType() const;
+    virtual void       setKnownDrawSize(S32 width, S32 height);
+    virtual bool       bindDefaultImage(const S32 stage = 0);
+    virtual bool       bindDebugImage(const S32 stage = 0);
+    virtual void       forceImmediateUpdate();
+    virtual void       setActive();
+    virtual S32        getWidth(S32 discard_level = -1) const;
+    virtual S32        getHeight(S32 discard_level = -1) const;
+    virtual bool       isActiveFetching();
     virtual LLImageGL* getGLTexture() const;
 
 private:
-	virtual void updateBindStatsForTester();
+    virtual void updateBindStatsForTester();
 };
 #endif