Cleanup actions from code review of llappearance with nyx

14 files changed, 23 insertions, 30 deletions

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 875b5be152..5935eeb192 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -78,7 +78,6 @@ set(cmake_SOURCE_FILES
     Tut.cmake
     UI.cmake
     UnixInstall.cmake
-    Viewer.cmake
     Variables.cmake
     XmlRpcEpi.cmake
     ZLIB.cmake
diff --git a/indra/cmake/Viewer.cmake b/indra/cmake/Viewer.cmake
deleted file mode 100644
index 771bb0ed7a..0000000000
--- a/indra/cmake/Viewer.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- cmake -*-
-
-set(VIEWER_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/newview
-    )
-
-set(VIEWER_LIBRARIES viewer)
diff --git a/indra/llappearance/CMakeLists.txt b/indra/llappearance/CMakeLists.txt
index f77c7e6440..0206f76546 100644
--- a/indra/llappearance/CMakeLists.txt
+++ b/indra/llappearance/CMakeLists.txt
@@ -4,7 +4,6 @@ project(llappearance)
 
 include(00-Common)
 include(LLCommon)
-include(Viewer)
 include(LLAudio)
 include(LLCharacter)
 include(LLCommon)
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index 2cc38ae2ab..75b9c1ffa5 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -27,6 +27,7 @@
 #include "linden_common.h"
 
 #include "llavatarappearance.h"
+#include "lldeleteutils.h"
 #include "lltexglobalcolor.h"
 
 const LLColor4 DUMMY_COLOR = LLColor4(0.5,0.5,0.5,1.0);
@@ -40,6 +41,14 @@ LLAvatarAppearance::LLAvatarAppearance() :
 {
 }
 
+// virtual
+LLAvatarAppearance::~LLAvatarAppearance()
+{
+	deleteAndClear(mTexSkinColor);
+	deleteAndClear(mTexHairColor);
+	deleteAndClear(mTexEyeColor);
+}
+
 using namespace LLAvatarAppearanceDefines;
 
 //static
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index e882868e91..0e746b3b9d 100644
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -28,7 +28,7 @@
 #define LL_AVATAR_APPEARANCE_H
 
 #include "llcharacter.h"
-#include "llframetimer.h"
+//#include "llframetimer.h"
 #include "llavatarappearancedefines.h"
 
 class LLTexLayerSet;
@@ -50,6 +50,7 @@ class LLAvatarAppearance : public LLCharacter
 
 public:
 	LLAvatarAppearance();
+	virtual ~LLAvatarAppearance();
 
 /**                    Initialization
  **                                                                            **
diff --git a/indra/llappearance/lltexlayer.h b/indra/llappearance/lltexlayer.h
index e9e1764763..e6c2ece64a 100644
--- a/indra/llappearance/lltexlayer.h
+++ b/indra/llappearance/lltexlayer.h
@@ -29,7 +29,7 @@
 
 #include <deque>
 #include "llgltexture.h"
-#include "llframetimer.h"
+//#include "llframetimer.h"
 #include "llavatarappearancedefines.h"
 #include "lltexlayerparams.h"
 
diff --git a/indra/llcharacter/CMakeLists.txt b/indra/llcharacter/CMakeLists.txt
index e9704d5635..a1712699eb 100644
--- a/indra/llcharacter/CMakeLists.txt
+++ b/indra/llcharacter/CMakeLists.txt
@@ -15,7 +15,6 @@ include_directories(
     ${LLMESSAGE_INCLUDE_DIRS}
     ${LLVFS_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
-    ${LLAPPEARANCE_INCLUDE_DIRS}
     )
 
 set(llcharacter_SOURCE_FILES
diff --git a/indra/llrender/llgltexture.h b/indra/llrender/llgltexture.h
index a02946d37f..b1efe77519 100644
--- a/indra/llrender/llgltexture.h
+++ b/indra/llrender/llgltexture.h
@@ -94,6 +94,8 @@ public:
 
 	virtual void dump();	// debug info to llinfos
 
+	virtual const LLUUID& getID() const = 0;
+
 	void setBoostLevel(S32 level);
 	S32  getBoostLevel() { return mBoostLevel; }
 
@@ -103,8 +105,6 @@ public:
 	void generateGLTexture() ;
 	void destroyGLTexture() ;
 
-	virtual const LLUUID& getID() const = 0;
-
 	//---------------------------------------------------------------------------------------------
 	//functions to access LLImageGL
 	//---------------------------------------------------------------------------------------------
diff --git a/indra/newview/lldriverparam.cpp b/indra/newview/lldriverparam.cpp
index 0ae9acd1af..5abf72d51f 100644
--- a/indra/newview/lldriverparam.cpp
+++ b/indra/newview/lldriverparam.cpp
@@ -629,9 +629,9 @@ void LLDriverParam::setDrivenWeight(LLDrivenEntry *driven, F32 driven_weight, bo
 		driven->mParam->getCrossWearable())
 	{
 		LLViewerWearable* wearable = dynamic_cast<LLViewerWearable*> (mWearablep);
-		if (!wearable->isOnTop())
+		if (wearable->isOnTop())
 		{
-			use_self = false;
+			use_self = true;
 		}
 	}
 
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 16baefac4f..db08c16f15 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -973,12 +973,6 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			}
 			else if(!mUrl.empty() && mCanUseHTTP)
 			{
-				if (!(mUrl.compare(0, 7, "http://") == 0) &&
-				    !(mUrl.compare(0, 8, "https://") == 0))
-				{
-					// *TODO:?remove this warning
-					llwarns << "Unknown URL Type: " << mUrl << llendl;
-				}
 				setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
 				mState = SEND_HTTP_REQ;
 			}
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp
index 69457ab1db..f516562c2f 100644
--- a/indra/newview/llviewertexlayer.cpp
+++ b/indra/newview/llviewertexlayer.cpp
@@ -214,9 +214,6 @@ void LLViewerTexLayerSetBuffer::preRenderTexLayerSet()
 // virtual
 void LLViewerTexLayerSetBuffer::postRenderTexLayerSet(BOOL success)
 {
-	// *TODO: Old logic does not check success before setGLTextureCreated
-	// we have valid texture data now
-	mGLTexturep->setGLTextureCreated(true);
 
 	LLTexLayerSetBuffer::postRenderTexLayerSet(success);
 	LLViewerDynamicTexture::postRender(success);
@@ -259,6 +256,10 @@ void LLViewerTexLayerSetBuffer::midRenderTexLayerSet(BOOL success)
 	{
 		doUpdate();
 	}
+
+	// *TODO: Old logic does not check success before setGLTextureCreated
+	// we have valid texture data now
+	mGLTexturep->setGLTextureCreated(true);
 }
 
 BOOL LLViewerTexLayerSetBuffer::isInitialized(void) const
diff --git a/indra/newview/llviewertexlayer.h b/indra/newview/llviewertexlayer.h
index 6788214f3a..95c339a5b0 100644
--- a/indra/newview/llviewertexlayer.h
+++ b/indra/newview/llviewertexlayer.h
@@ -45,7 +45,7 @@ public:
 	LLViewerTexLayerSet(LLAvatarAppearance* const appearance);
 	virtual ~LLViewerTexLayerSet();
 
-	virtual void				requestUpdate();
+	/*virtual*/void				requestUpdate();
 	void						requestUpload();
 	void						cancelUpload();
 	BOOL						isLocalTextureDataAvailable() const;
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index d180d7fa99..254a0cf92f 100755
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -637,7 +637,6 @@ public:
 	static void init() ;
 	static void cleanup() ;
 };
-
 //
 //this class is used for test/debug only
 //it tracks the activities of the texture pipeline
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index b8999728b3..5f780da145 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -473,14 +473,14 @@ private:
 public:
 	BOOL 		morphMaskNeedsUpdate(LLAvatarAppearanceDefines::EBakedTextureIndex index = LLAvatarAppearanceDefines::BAKED_NUM_INDICES);
 	void 		addMaskedMorph(LLAvatarAppearanceDefines::EBakedTextureIndex index, LLPolyMorphTarget* morph_target, BOOL invert, std::string layer);
-	virtual void	applyMorphMask(U8* tex_data, S32 width, S32 height, S32 num_components, LLAvatarAppearanceDefines::EBakedTextureIndex index = LLAvatarAppearanceDefines::BAKED_NUM_INDICES);
+	/*virtual*/void applyMorphMask(U8* tex_data, S32 width, S32 height, S32 num_components, LLAvatarAppearanceDefines::EBakedTextureIndex index = LLAvatarAppearanceDefines::BAKED_NUM_INDICES);
 
 	
 	//--------------------------------------------------------------------
 	// Global colors
 	//--------------------------------------------------------------------
 public:
-	virtual void	onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL upload_bake);
+	/*virtual*/void onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL upload_bake);
 
 	//--------------------------------------------------------------------
 	// Visibility
@@ -1039,7 +1039,6 @@ public:
 	void 			debugAvatarRezTime(std::string notification_name, std::string comment = "");
 	F32				debugGetExistenceTimeElapsedF32() const { return mDebugExistenceTimer.getElapsedTimeF32(); }
 
-
 protected:
 	LLFrameTimer	mRuthDebugTimer; // For tracking how long it takes for av to rez
 	LLFrameTimer	mDebugExistenceTimer; // Debugging for how long the avatar has been in memory.