merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:

svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .

Progress can be tracked in DEV-32551.

 -Nyx

1 files changed, 12 insertions, 5 deletions

diff --git a/indra/newview/lltexlayerparams.h b/indra/newview/lltexlayerparams.h
index 49feb01b5e..589bd41054 100644
--- a/indra/newview/lltexlayerparams.h
+++ b/indra/newview/lltexlayerparams.h
@@ -36,15 +36,18 @@
 
 class LLTexLayer;
 class LLVOAvatar;
+class LLWearable;
 
 class LLTexLayerParam : public LLViewerVisualParam
 {
 public: 
-	LLTexLayerParam(LLTexLayer *layer);
+	LLTexLayerParam(LLTexLayerInterface *layer);
 	LLTexLayerParam(LLVOAvatar *avatar);
-	/* Virtual */ BOOL setInfo(LLViewerVisualParamInfo *info);
+	/* Virtual */ BOOL setInfo(LLViewerVisualParamInfo *info, BOOL add_to_avatar  );
+	/*virtual*/ LLViewerVisualParam * 	cloneParam(LLWearable* wearable) const = 0;
+
 protected:
-	LLTexLayer*				mTexLayer;
+	LLTexLayerInterface*	mTexLayer;
 	LLVOAvatar*             mAvatar;
 };
 
@@ -54,10 +57,12 @@ protected:
 class LLTexLayerParamAlpha : public LLTexLayerParam
 {
 public:
-	LLTexLayerParamAlpha( LLTexLayer* layer );
+	LLTexLayerParamAlpha( LLTexLayerInterface* layer );
 	LLTexLayerParamAlpha( LLVOAvatar* avatar );
 	/*virtual*/ ~LLTexLayerParamAlpha();
 
+	/*virtual*/ LLViewerVisualParam * 	cloneParam(LLWearable* wearable = NULL) const;
+
 	// LLVisualParam Virtual functions
 	///*virtual*/ BOOL		parseData(LLXmlTreeNode* node);
 	/*virtual*/ void		apply( ESex avatar_sex ) {}
@@ -129,10 +134,12 @@ public:
 		OP_COUNT = 3 // Number of operations
 	};
 
-	LLTexLayerParamColor( LLTexLayer* layer );
+	LLTexLayerParamColor( LLTexLayerInterface* layer );
 	LLTexLayerParamColor( LLVOAvatar* avatar );
 	/* virtual */ ~LLTexLayerParamColor();
 
+	/*virtual*/ LLViewerVisualParam * 	cloneParam(LLWearable* wearable = NULL) const;
+
 	// LLVisualParam Virtual functions
 	///*virtual*/ BOOL			parseData(LLXmlTreeNode* node);
 	/*virtual*/ void			apply( ESex avatar_sex ) {}