Brought over lltexglobalcolor

indra/llappearance/CMakeLists.txt

@@ -36,7 +36,7 @@ set(llappearance_SOURCE_FILES
     llpolyskeletaldistortion.cpp
     llpolymesh.cpp
     llpolymorph.cpp
-    #lltexglobalcolor.cpp
+    lltexglobalcolor.cpp
     lltexlayer.cpp
     lltexlayerparams.cpp
     lltexturemanagerbridge.cpp
@@ -59,11 +59,11 @@ set(llappearance_HEADER_FILES
     llpolyskeletaldistortion.h
     llpolymesh.h
     llpolymorph.h
-    #lltexglobalcolor.h
+    lltexglobalcolor.h
     lltexlayer.h
     lltexlayerparams.h
     lltexturemanagerbridge.h
-    #llwearable.h
+    llwearable.h
     llwearabledata.h
     llwearabletype.h
     llviewervisualparam.h

indra/llappearance/lltexglobalcolor.cpp

@@ -24,20 +24,20 @@
  * $/LicenseInfo$
  */
 
-#include "llviewerprecompiledheaders.h"
-#include "llagent.h"
-#include "llviewertexlayer.h"
-#include "llvoavatar.h"
-#include "llwearable.h"
+#include "linden_common.h"
+#include "llavatarappearance.h"
+#include "lltexlayer.h"
 #include "lltexglobalcolor.h"
 
+class LLWearable;
+
 //-----------------------------------------------------------------------------
 // LLTexGlobalColor
 //-----------------------------------------------------------------------------
 
-LLTexGlobalColor::LLTexGlobalColor(LLVOAvatar* avatar) 
+LLTexGlobalColor::LLTexGlobalColor(LLAvatarAppearance* appearance)
 	:
-	mAvatar(avatar),
+	mAvatarAppearance(appearance),
 	mInfo(NULL)
 {
 }
@@ -91,7 +91,7 @@ const std::string& LLTexGlobalColor::getName() const
 // LLTexParamGlobalColor
 //-----------------------------------------------------------------------------
 LLTexParamGlobalColor::LLTexParamGlobalColor(LLTexGlobalColor* tex_global_color) :
-	LLTexLayerParamColor(tex_global_color->getAvatar()),
+	LLTexLayerParamColor(tex_global_color->getAvatarAppearance()),
 	mTexGlobalColor(tex_global_color)
 {
 }

indra/llappearance/lltexglobalcolor.h

@@ -1,6 +1,6 @@
 /** 
  * @file lltexglobalcolor.h
- * @brief This is global texture color info used by llvoavatar.
+ * @brief This is global texture color info used by llavatarappearance.
  *
  * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * Second Life Viewer Source Code
@@ -30,31 +30,31 @@
 #include "lltexlayer.h"
 #include "lltexlayerparams.h"
 
-class LLVOAvatar;
+class LLAvatarAppearance;
 class LLWearable;
 class LLTexGlobalColorInfo;
 
 class LLTexGlobalColor
 {
 public:
-	LLTexGlobalColor( LLVOAvatar* avatar );
+	LLTexGlobalColor( LLAvatarAppearance* appearance );
 	~LLTexGlobalColor();
 
 	LLTexGlobalColorInfo*	getInfo() const { return mInfo; }
 	//   This sets mInfo and calls initialization functions
 	BOOL					setInfo(LLTexGlobalColorInfo *info);
 	
-	LLVOAvatar*				getAvatar()	const			   	{ return mAvatar; }
+	LLAvatarAppearance*		getAvatarAppearance()	const	   	{ return mAvatarAppearance; }
 	LLColor4				getColor() const;
 	const std::string&		getName() const;
 
 private:
 	param_color_list_t		mParamGlobalColorList;
-	LLVOAvatar*				mAvatar;  // just backlink, don't LLPointer 
+	LLAvatarAppearance*		mAvatarAppearance;  // just backlink, don't LLPointer 
 	LLTexGlobalColorInfo	*mInfo;
 };
 
-// Used by llvoavatar to determine skin/eye/hair color.
+// Used by llavatarappearance to determine skin/eye/hair color.
 class LLTexGlobalColorInfo
 {
 	friend class LLTexGlobalColor;

indra/newview/CMakeLists.txt

@@ -420,7 +420,6 @@ set(viewer_SOURCE_FILES
     llstylemap.cpp
     llsurface.cpp
     llsurfacepatch.cpp
-    lltexglobalcolor.cpp
     lltexturecache.cpp
     lltexturectrl.cpp
     lltexturefetch.cpp
@@ -921,7 +920,6 @@ set(viewer_HEADER_FILES
     llsurface.h
     llsurfacepatch.h
     lltable.h
-    lltexglobalcolor.h
     lltexturecache.h
     lltexturectrl.h
     lltexturefetch.h