merged .hgtags

1 files changed, 22 insertions, 17 deletions

diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 3a5f7602fe..47de99ce25 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -120,12 +120,13 @@ public:
 	void processJointNode( domNode* pNode, std::map<std::string,LLMatrix4>& jointTransforms );
 	void extractTranslation( domTranslate* pTranslate, LLMatrix4& transform );
 	void extractTranslationViaElement( daeElement* pTranslateElement, LLMatrix4& transform );
-	
+	void extractTranslationViaSID( daeElement* pElement, LLMatrix4& transform );
+
 	void setLoadState(U32 state);
 
 	void buildJointToNodeMappingFromScene( daeElement* pRoot );
 	void processJointToNodeMapping( domNode* pNode );
-
+	void processChildJoints( domNode* pParentNode );
 
 	//map of avatar joints as named in COLLADA assets to internal joint names
 	std::map<std::string, std::string> mJointMap;
@@ -176,18 +177,18 @@ public:
 
 	void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost);
 	
-	static void onBrowseLOD(void* data);
+	void onBrowseLOD(S32 lod);
 	
 	static void onReset(void* data);
 
 	static void onUpload(void* data);
 	
-	static void refresh(LLUICtrl* ctrl, void* data);
+	void refresh();
 	
 	void			loadModel(S32 lod);
 	void 			loadModel(S32 lod, const std::string& file_name, bool force_disable_slm = false);
 	
-	void onViewOptionChecked(const LLSD& userdata);
+	void onViewOptionChecked(LLUICtrl* ctrl);
 	bool isViewOptionChecked(const LLSD& userdata);
 	bool isViewOptionEnabled(const LLSD& userdata);
 	void setViewOptionEnabled(const std::string& option, bool enabled);
@@ -217,17 +218,17 @@ protected:
 	static void		onPelvisOffsetCommit(LLUICtrl*, void*);
 	static void		onUploadJointsCommit(LLUICtrl*,void*);
 	static void		onUploadSkinCommit(LLUICtrl*,void*);
-	
-	static void		onPhysicsLoadRadioCommit(LLUICtrl*,void *data);
 
 	static void		onPreviewLODCommit(LLUICtrl*,void*);
 	
 	static void		onGenerateNormalsCommit(LLUICtrl*,void*);
 	
+	void toggleGenarateNormals();
+
 	static void		onAutoFillCommit(LLUICtrl*,void*);
-	static void		onLODParamCommit(LLUICtrl*,void*);
-	static void		onLODParamCommitTriangleLimit(LLUICtrl*,void*);
 	
+	void onLODParamCommit(S32 lod, bool enforce_tri_limit);
+
 	static void		onExplodeCommit(LLUICtrl*, void*);
 	
 	static void onPhysicsParamCommit(LLUICtrl* ctrl, void* userdata);
@@ -266,11 +267,9 @@ protected:
 	//store which lod mode each LOD is using
 	// 0 - load from file
 	// 1 - auto generate
-	// 2 - None
+	// 2 - use LoD above
 	S32 mLODMode[4];
 
-	LLMenuButton* mViewOptionMenuButton;
-	LLToggleableMenu* mViewOptionMenu;
 	LLMutex* mStatusLock;
 
 	LLSD mModelPhysicsFee;
@@ -279,9 +278,16 @@ private:
 	void onClickCalculateBtn();
 	void toggleCalculateButton();
 
+	void onLoDSourceCommit(S32 lod);
+
 	// Toggles between "Calculate weights & fee" and "Upload" buttons.
 	void toggleCalculateButton(bool visible);
 
+	// resets display options of model preview to their defaults.
+	void resetDisplayOptions();
+
+	void createSmoothComboBox(LLComboBox* combo_box, float min, float max);
+
 	LLButton* mUploadBtn;
 	LLButton* mCalculateBtn;
 };
@@ -334,9 +340,11 @@ public:
 	void saveUploadData(const std::string& filename, bool save_skinweights, bool save_joint_poisitions);
 	void clearIncompatible(S32 lod);
 	void updateStatusMessages();
+	void updateLodControls(S32 lod);
 	void clearGLODGroup();
-	void onLODParamCommit(bool enforce_tri_limit);
-
+	void onLODParamCommit(S32 lod, bool enforce_tri_limit);
+	void addEmptyFace( LLModel* pTarget );
+	
 	const bool getModelPivot( void ) const { return mHasPivot; }
 	void setHasPivot( bool val ) { mHasPivot = val; }
 	void setModelPivot( const LLVector3& pivot ) { mModelPivot = pivot; }
@@ -365,9 +373,6 @@ public:
 	
 	void setLoadState( U32 state ) { mLoadState = state; }
 	U32 getLoadState() { return mLoadState; }
-	//setRestJointFlag: If an asset comes through that changes the joints, we want the reset to persist
-	void setResetJointFlag( bool state ) { if ( !mResetJoints ) mResetJoints = state; }
-	const bool getResetJointFlag( void ) const { return mResetJoints; }
 	void setRigWithSceneParity( bool state ) { mRigParityWithScene = state; }
 	const bool getRigWithSceneParity( void ) const { return mRigParityWithScene; }