Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 24 insertions, 24 deletions

diff --git a/indra/llui/llprogressbar.h b/indra/llui/llprogressbar.h
index a8ec83ea00..0d5d32cf21 100644
--- a/indra/llui/llprogressbar.h
+++ b/indra/llui/llprogressbar.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llprogressbar.h
  * @brief LLProgressBar 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$
  */
@@ -32,35 +32,35 @@
 #include "lluiimage.h"
 
 class LLProgressBar
-	: public LLUICtrl
+    : public LLUICtrl
 {
 public:
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<LLUIImage*>	image_bar,
-								image_fill;
+    struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+    {
+        Optional<LLUIImage*>    image_bar,
+                                image_fill;
 
-		Optional<LLUIColor>		color_bar,
-								color_bg;
+        Optional<LLUIColor>     color_bar,
+                                color_bg;
 
-		Params();
-	};
-	LLProgressBar(const Params&);
-	virtual ~LLProgressBar();
+        Params();
+    };
+    LLProgressBar(const Params&);
+    virtual ~LLProgressBar();
 
-	void setValue(const LLSD& value);
+    void setValue(const LLSD& value);
 
-	/*virtual*/ void draw();
+    /*virtual*/ void draw();
 
 private:
-	F32 mPercentDone;
+    F32 mPercentDone;
+
+    LLPointer<LLUIImage>    mImageBar;
+    LLUIColor   mColorBar;
 
-	LLPointer<LLUIImage>	mImageBar;
-	LLUIColor	mColorBar;
+    LLUIColor    mColorBackground;
 
-	LLUIColor    mColorBackground;
-	
-	LLPointer<LLUIImage>	mImageFill;
+    LLPointer<LLUIImage>    mImageFill;
 };
 
 #endif // LL_LLPROGRESSBAR_H