Merge tag '7.1.7-release'

source for viewer 7.1.7.8974243247

1 files changed, 29 insertions, 29 deletions

diff --git a/indra/llappearance/lltexglobalcolor.h b/indra/llappearance/lltexglobalcolor.h
index 3b426053de..183eb47a4a 100644
--- a/indra/llappearance/lltexglobalcolor.h
+++ b/indra/llappearance/lltexglobalcolor.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lltexglobalcolor.h
  * @brief This is global texture color info used by llavatarappearance.
  *
  * $LicenseInfo:firstyear=2008&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$
  */
@@ -37,49 +37,49 @@ class LLTexGlobalColorInfo;
 class LLTexGlobalColor
 {
 public:
-	LLTexGlobalColor( LLAvatarAppearance* appearance );
-	~LLTexGlobalColor();
+    LLTexGlobalColor( LLAvatarAppearance* appearance );
+    ~LLTexGlobalColor();
+
+    LLTexGlobalColorInfo*   getInfo() const { return mInfo; }
+    //   This sets mInfo and calls initialization functions
+    BOOL                    setInfo(LLTexGlobalColorInfo *info);
 
-	LLTexGlobalColorInfo*	getInfo() const { return mInfo; }
-	//   This sets mInfo and calls initialization functions
-	BOOL					setInfo(LLTexGlobalColorInfo *info);
-	
-	LLAvatarAppearance*		getAvatarAppearance()	const	   	{ return mAvatarAppearance; }
-	LLColor4				getColor() const;
-	const std::string&		getName() const;
+    LLAvatarAppearance*     getAvatarAppearance()   const       { return mAvatarAppearance; }
+    LLColor4                getColor() const;
+    const std::string&      getName() const;
 
 private:
-	param_color_list_t		mParamGlobalColorList;
-	LLAvatarAppearance*		mAvatarAppearance;  // just backlink, don't LLPointer 
-	LLTexGlobalColorInfo	*mInfo;
+    param_color_list_t      mParamGlobalColorList;
+    LLAvatarAppearance*     mAvatarAppearance;  // just backlink, don't LLPointer
+    LLTexGlobalColorInfo    *mInfo;
 };
 
 // Used by llavatarappearance to determine skin/eye/hair color.
 class LLTexGlobalColorInfo
 {
-	friend class LLTexGlobalColor;
+    friend class LLTexGlobalColor;
 public:
-	LLTexGlobalColorInfo();
-	~LLTexGlobalColorInfo();
+    LLTexGlobalColorInfo();
+    ~LLTexGlobalColorInfo();
 
-	BOOL parseXml(LLXmlTreeNode* node);
+    BOOL parseXml(LLXmlTreeNode* node);
 
 private:
-	param_color_info_list_t		mParamColorInfoList;
-	std::string				mName;
+    param_color_info_list_t     mParamColorInfoList;
+    std::string             mName;
 };
 
 class LLTexParamGlobalColor : public LLTexLayerParamColor
 {
 public:
-	LLTexParamGlobalColor(LLTexGlobalColor *tex_color);
-	virtual ~LLTexParamGlobalColor();
-	/*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const;
+    LLTexParamGlobalColor(LLTexGlobalColor *tex_color);
+    virtual ~LLTexParamGlobalColor();
+    /*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const;
 protected:
-	LLTexParamGlobalColor(const LLTexParamGlobalColor& pOther);
-	/*virtual*/ void onGlobalColorChanged();
+    LLTexParamGlobalColor(const LLTexParamGlobalColor& pOther);
+    /*virtual*/ void onGlobalColorChanged();
 private:
-	LLTexGlobalColor*		mTexGlobalColor;
+    LLTexGlobalColor*       mTexGlobalColor;
 };
 
 #endif