More clean-up to closer match original file order. For llavatarappearance diffs

8 files changed, 71 insertions, 37 deletions

diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index 0ab3960e64..e882868e91 100644
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -31,8 +31,8 @@
 #include "llframetimer.h"
 #include "llavatarappearancedefines.h"
 
-class LLTexGlobalColor;
 class LLTexLayerSet;
+class LLTexGlobalColor;
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // LLAvatarAppearance
@@ -43,27 +43,36 @@ class LLAvatarAppearance : public LLCharacter
 {
 	LOG_CLASS(LLAvatarAppearance);
 
+/********************************************************************************
+ **                                                                            **
+ **                    INITIALIZATION
+ **/
+
 public:
 	LLAvatarAppearance();
 
-	//--------------------------------------------------------------------
-	// Clothing colors (convenience functions to access visual parameters)
-	//--------------------------------------------------------------------
-public:
-	void			setClothesColor(LLAvatarAppearanceDefines::ETextureIndex te, const LLColor4& new_color, BOOL upload_bake);
-	LLColor4		getClothesColor(LLAvatarAppearanceDefines::ETextureIndex te);
-	static BOOL		teToColorParams(LLAvatarAppearanceDefines::ETextureIndex te, U32 *param_name);
+/**                    Initialization
+ **                                                                            **
+ *******************************************************************************/
 
-	//--------------------------------------------------------------------
-	// Global colors
-	//--------------------------------------------------------------------
+/********************************************************************************
+ **                                                                            **
+ **                    STATE
+ **/
 public:
-	LLColor4		getGlobalColor(const std::string& color_name ) const;
-	virtual void	onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL upload_bake) = 0;
-protected:
-	LLTexGlobalColor* mTexSkinColor;
-	LLTexGlobalColor* mTexHairColor;
-	LLTexGlobalColor* mTexEyeColor;
+	virtual bool 	isSelf() const { return false; } // True if this avatar is for this viewer's agent
+	virtual BOOL	isUsingBakedTextures() const = 0;
+	
+/**                    State
+ **                                                                            **
+ *******************************************************************************/
+
+
+/********************************************************************************
+ **                                                                            **
+ **                    RENDERING
+ **/
+	BOOL		mIsDummy; // for special views
 
 	//--------------------------------------------------------------------
 	// Morph masks
@@ -71,6 +80,10 @@ protected:
 public:
 	virtual void	applyMorphMask(U8* tex_data, S32 width, S32 height, S32 num_components, LLAvatarAppearanceDefines::EBakedTextureIndex index = LLAvatarAppearanceDefines::BAKED_NUM_INDICES) = 0;
 
+/**                    Rendering
+ **                                                                            **
+ *******************************************************************************/
+
 	//--------------------------------------------------------------------
 	// Composites
 	//--------------------------------------------------------------------
@@ -81,39 +94,65 @@ public:
  **                                                                            **
  **                    MESHES
  **/
+
+public:
+	virtual void	updateMeshTextures() = 0;
 	virtual void	dirtyMesh() = 0; // Dirty the avatar mesh
+protected:
 	virtual void	dirtyMesh(S32 priority) = 0; // Dirty the avatar mesh, with priority
 
-/********************************************************************************
+/**                    Meshes
  **                                                                            **
- **                    RENDERING
- **/
-	BOOL		mIsDummy; // for special views
+ *******************************************************************************/
 
 /********************************************************************************
  **                                                                            **
- **                    STATE
+ **                    APPEARANCE
  **/
+
+	//--------------------------------------------------------------------
+	// Clothing colors (convenience functions to access visual parameters)
+	//--------------------------------------------------------------------
 public:
-	virtual bool 	isSelf() const { return false; } // True if this avatar is for this viewer's agent
-	virtual BOOL	isUsingBakedTextures() const = 0;
+	void			setClothesColor(LLAvatarAppearanceDefines::ETextureIndex te, const LLColor4& new_color, BOOL upload_bake);
+	LLColor4		getClothesColor(LLAvatarAppearanceDefines::ETextureIndex te);
+	static BOOL		teToColorParams(LLAvatarAppearanceDefines::ETextureIndex te, U32 *param_name);
+
+	//--------------------------------------------------------------------
+	// Global colors
+	//--------------------------------------------------------------------
+public:
+	LLColor4		getGlobalColor(const std::string& color_name ) const;
+	virtual void	onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL upload_bake) = 0;
+protected:
+	LLTexGlobalColor* mTexSkinColor;
+	LLTexGlobalColor* mTexHairColor;
+	LLTexGlobalColor* mTexEyeColor;
+
+	//--------------------------------------------------------------------
+	// Visibility
+	//--------------------------------------------------------------------
+public:
+	static LLColor4 getDummyColor();
+/**                    Appearance
+ **                                                                            **
+ *******************************************************************************/
 
 /********************************************************************************
  **                                                                            **
  **                    WEARABLES
  **/
+
 public:
+	virtual BOOL			isWearingWearableType(LLWearableType::EType type ) const = 0;
+
 	virtual U32				getWearableCount(const LLWearableType::EType type) const = 0;
 	virtual U32				getWearableCount(const U32 tex_index) const = 0;
 
 	virtual LLWearable*			getWearable(const LLWearableType::EType type, U32 index /*= 0*/) = 0;
 	virtual const LLWearable* 	getWearable(const LLWearableType::EType type, U32 index /*= 0*/) const = 0;
 
-	virtual BOOL			isWearingWearableType(LLWearableType::EType type ) const = 0;
 
-public:
-	static LLColor4 getDummyColor();
-	virtual void	updateMeshTextures() = 0;
 };
 
 #endif // LL_AVATAR_APPEARANCE_H
diff --git a/indra/llappearance/llinventoryicon.cpp b/indra/llappearance/llinventoryicon.cpp
index 62261058ef..371f60353b 100644
--- a/indra/llappearance/llinventoryicon.cpp
+++ b/indra/llappearance/llinventoryicon.cpp
@@ -24,7 +24,6 @@
  * $/LicenseInfo$
  */
 
-//#include "llviewerprecompiledheaders.h"
 #include "linden_common.h"
 #include "llinventoryicon.h"
 
diff --git a/indra/llappearance/lltexglobalcolor.cpp b/indra/llappearance/lltexglobalcolor.cpp
index d9c6150fc6..f38b982104 100644
--- a/indra/llappearance/lltexglobalcolor.cpp
+++ b/indra/llappearance/lltexglobalcolor.cpp
@@ -25,10 +25,8 @@
  */
 
 #include "linden_common.h"
-
 #include "llavatarappearance.h"
 #include "lltexlayer.h"
-//#include "llwearable.h"
 #include "lltexglobalcolor.h"
 
 class LLWearable;
diff --git a/indra/llappearance/llviewervisualparam.cpp b/indra/llappearance/llviewervisualparam.cpp
index e1ddeeeff0..a6792d0974 100644
--- a/indra/llappearance/llviewervisualparam.cpp
+++ b/indra/llappearance/llviewervisualparam.cpp
@@ -27,7 +27,6 @@
 //-----------------------------------------------------------------------------
 // Header Files
 //-----------------------------------------------------------------------------
-//#include "llviewerprecompiledheaders.h"
 #include "linden_common.h"
 
 #include "llviewervisualparam.h"
diff --git a/indra/llappearance/llwearabletype.cpp b/indra/llappearance/llwearabletype.cpp
index 009a3b631a..c72a0965fe 100644
--- a/indra/llappearance/llwearabletype.cpp
+++ b/indra/llappearance/llwearabletype.cpp
@@ -25,7 +25,6 @@
  */
 
 #include "linden_common.h"
- 
 #include "llwearabletype.h"
 #include "llinventoryicon.h"
 #include "lltrans.h"
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 7adf5212c2..16baefac4f 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -973,7 +973,8 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			}
 			else if(!mUrl.empty() && mCanUseHTTP)
 			{
-				if (!(mUrl.compare(0, 7, "http://") == 0))
+				if (!(mUrl.compare(0, 7, "http://") == 0) &&
+				    !(mUrl.compare(0, 8, "https://") == 0))
 				{
 					// *TODO:?remove this warning
 					llwarns << "Unknown URL Type: " << mUrl << llendl;
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 644ea22b53..d54d06a6a7 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -454,7 +454,6 @@ public:
 	static void	deleteCachedImages(bool clearAll=true);
 	static void	destroyGL();
 	static void	restoreGL();
-	BOOL		mIsDummy; // for special views
 	S32			mSpecialRenderMode; // special lighting
 	U32			mAttachmentGeometryBytes; //number of bytes in attached geometry
 	F32			mAttachmentSurfaceArea; //estimated surface area of attachments
diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp
index 9f04fbecf0..6c4790ad77 100644
--- a/indra/newview/llwearablelist.cpp
+++ b/indra/newview/llwearablelist.cpp
@@ -112,8 +112,8 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
 		else
 		{
 			wearable = new LLViewerWearable(uuid);
-			bool res = wearable->importFile( fp );
-			if (!res)
+			LLWearable::EImportResult result = wearable->importFile( fp );
+			if (LLWearable::SUCCESS != result)
 			{
 				if (wearable->getType() == LLWearableType::WT_COUNT)
 				{