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, 100 insertions, 0 deletions

diff --git a/indra/newview/llscrollingpanelparam.h b/indra/newview/llscrollingpanelparam.h
new file mode 100644
index 0000000000..8c5db64816
--- /dev/null
+++ b/indra/newview/llscrollingpanelparam.h
@@ -0,0 +1,100 @@
+/** 
+ * @file llscrollingpanelparam.h
+ * @brief the scrolling panel containing a list of visual param 
+ *  	  panels
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_SCROLLINGPANELPARAM_H
+#define LL_SCROLLINGPANELPARAM_H
+
+#include "llpanel.h"
+#include "llscrollingpanellist.h"
+
+class LLViewerJointMesh;
+class LLViewerVisualParam;
+class LLWearable;
+class LLVisualParamHint;
+class LLViewerVisualParam;
+
+class LLScrollingPanelParam : public LLScrollingPanel
+{
+public:
+	LLScrollingPanelParam( const LLPanel::Params& panel_params,
+						   LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable );
+	virtual ~LLScrollingPanelParam();
+
+	virtual void		draw();
+	virtual void		setVisible( BOOL visible );
+	virtual void		updatePanel(BOOL allow_modify);
+
+	static void			onSliderMouseDown(LLUICtrl* ctrl, void* userdata);
+	static void			onSliderMoved(LLUICtrl* ctrl, void* userdata);
+	static void			onSliderMouseUp(LLUICtrl* ctrl, void* userdata);
+
+	static void			onHintMinMouseDown(void* userdata);
+	static void			onHintMinHeldDown(void* userdata);
+	static void			onHintMaxMouseDown(void* userdata);
+	static void			onHintMaxHeldDown(void* userdata);
+	static void			onHintMinMouseUp(void* userdata);
+	static void			onHintMaxMouseUp(void* userdata);
+
+	void				onHintMouseDown( LLVisualParamHint* hint );
+	void				onHintHeldDown( LLVisualParamHint* hint );
+
+	F32					weightToPercent( F32 weight );
+	F32					percentToWeight( F32 percent );
+
+public:
+	// Constants for LLPanelVisualParam
+	const static F32 PARAM_STEP_TIME_THRESHOLD;
+	
+	const static S32 BTN_BORDER;
+	const static S32 PARAM_HINT_WIDTH;
+	const static S32 PARAM_HINT_HEIGHT;
+	const static S32 PARAM_HINT_LABEL_HEIGHT;
+	const static S32 PARAM_PANEL_WIDTH;
+	const static S32 PARAM_PANEL_HEIGHT; 
+
+
+public:
+	LLViewerVisualParam* mParam;
+	LLPointer<LLVisualParamHint>	mHintMin;
+	LLPointer<LLVisualParamHint>	mHintMax;
+	static S32 			sUpdateDelayFrames;
+	
+protected:
+	LLTimer				mMouseDownTimer;	// timer for how long mouse has been held down on a hint.
+	F32					mLastHeldTime;
+
+	BOOL mAllowModify;
+	LLWearable *mWearable;
+}; 
+
+#endif