Merge branch 'release/maint-b' into nat/maint-b-tests

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/llhudeffectblob.h b/indra/newview/llhudeffectblob.h
index ce3e8500fc..6435371d78 100644
--- a/indra/newview/llhudeffectblob.h
+++ b/indra/newview/llhudeffectblob.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llhudeffectblob.h
  * @brief LLHUDEffectBlob 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$
  */
@@ -33,22 +33,22 @@
 class LLHUDEffectBlob : public LLHUDEffect
 {
 public:
-	friend class LLHUDObject;
+    friend class LLHUDObject;
 
-	void markDead();
+    void markDead();
 
-	void setPixelSize(S32 pixels) { mPixelSize = pixels; }
+    void setPixelSize(S32 pixels) { mPixelSize = pixels; }
 
 protected:
-	LLHUDEffectBlob(const U8 type);
-	~LLHUDEffectBlob();
+    LLHUDEffectBlob(const U8 type);
+    ~LLHUDEffectBlob();
 
-	/*virtual*/ void render();
-	/*virtual*/ void renderForTimer();
+    /*virtual*/ void render();
+    /*virtual*/ void renderForTimer();
 private:
-	S32				mPixelSize;
-	LLFrameTimer	mTimer;
-	LLPointer<LLUIImage> mImage;
+    S32             mPixelSize;
+    LLFrameTimer    mTimer;
+    LLPointer<LLUIImage> mImage;
 };
 
 #endif // LL_LLHUDEFFECTBLOB_H