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

1 files changed, 33 insertions, 33 deletions

diff --git a/indra/llprimitive/lltextureanim.h b/indra/llprimitive/lltextureanim.h
index f0d9f9df5c..ef76549903 100644
--- a/indra/llprimitive/lltextureanim.h
+++ b/indra/llprimitive/lltextureanim.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lltextureanim.h
  * @brief LLTextureAnim base 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$
  */
@@ -36,37 +36,37 @@ class LLDataPacker;
 class LLTextureAnim
 {
 public:
-	LLTextureAnim();
-	virtual ~LLTextureAnim();
+    LLTextureAnim();
+    virtual ~LLTextureAnim();
 
-	virtual void reset();
-	void packTAMessage(LLMessageSystem *mesgsys) const;
-	void packTAMessage(LLDataPacker &dp) const;
-	void unpackTAMessage(LLMessageSystem *mesgsys, const S32 block_num);
-	void unpackTAMessage(LLDataPacker &dp);
-	BOOL equals(const LLTextureAnim &other) const;
-	LLSD asLLSD() const;
-	operator LLSD() const { return asLLSD(); }
-	bool fromLLSD(LLSD& sd);
+    virtual void reset();
+    void packTAMessage(LLMessageSystem *mesgsys) const;
+    void packTAMessage(LLDataPacker &dp) const;
+    void unpackTAMessage(LLMessageSystem *mesgsys, const S32 block_num);
+    void unpackTAMessage(LLDataPacker &dp);
+    BOOL equals(const LLTextureAnim &other) const;
+    LLSD asLLSD() const;
+    operator LLSD() const { return asLLSD(); }
+    bool fromLLSD(LLSD& sd);
 
-	enum
-	{
-		ON				= 0x01,
-		LOOP			= 0x02,
-		REVERSE			= 0x04,
-		PING_PONG		= 0x08,
-		SMOOTH			= 0x10,
-		ROTATE			= 0x20,
-		SCALE			= 0x40,
-	};
+    enum
+    {
+        ON              = 0x01,
+        LOOP            = 0x02,
+        REVERSE         = 0x04,
+        PING_PONG       = 0x08,
+        SMOOTH          = 0x10,
+        ROTATE          = 0x20,
+        SCALE           = 0x40,
+    };
 
 public:
-	U8 mMode;
-	S8 mFace;
-	U8 mSizeX;
-	U8 mSizeY;
-	F32 mStart;
-	F32 mLength;
-	F32 mRate; // Rate in frames per second.
+    U8 mMode;
+    S8 mFace;
+    U8 mSizeX;
+    U8 mSizeY;
+    F32 mStart;
+    F32 mLength;
+    F32 mRate; // Rate in frames per second.
 };
 #endif