1 files changed, 15 insertions, 2 deletions

diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 7ec6a58ac7..c459b9296b 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -57,7 +57,9 @@ class domController;
 class domSkin;
 class domMesh;
 class LLMenuButton;
+class LLTabContainer;
 class LLToggleableMenu;
+class LLViewerTextEditor;
 
 class LLFloaterModelPreview : public LLFloaterModelUploadBase
 {
@@ -93,6 +95,8 @@ public:
 
 	static void onMouseCaptureLostModelPreview(LLMouseHandler*);
 	static void setUploadAmount(S32 amount) { sUploadAmount = amount; }
+	static void addStringToLog(const std::string& str, bool flash);
+	static void addStringToLog(const std::ostringstream& strm, bool flash);
 
 	void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost);
 	void setPreviewLOD(S32 lod);
@@ -109,11 +113,13 @@ public:
 	void 			loadModel(S32 lod, const std::string& file_name, bool force_disable_slm = false);
 	
 	void onViewOptionChecked(LLUICtrl* ctrl);
+	void onUploadOptionChecked(LLUICtrl* ctrl);
 	bool isViewOptionChecked(const LLSD& userdata);
 	bool isViewOptionEnabled(const LLSD& userdata);
 	void setViewOptionEnabled(const std::string& option, bool enabled);
 	void enableViewOption(const std::string& option);
 	void disableViewOption(const std::string& option);
+	void onShowSkinWeightChecked(LLUICtrl* ctrl);
 
 	bool isModelLoading();
 
@@ -152,6 +158,7 @@ protected:
 	static void		onAutoFillCommit(LLUICtrl*,void*);
 	
 	void onLODParamCommit(S32 lod, bool enforce_tri_limit);
+	void draw3dPreview();
 
 	static void		onExplodeCommit(LLUICtrl*, void*);
 	
@@ -173,11 +180,13 @@ protected:
     // FIXME - this function and mStatusMessage have no visible effect, and the
     // actual status messages are managed by directly manipulation of
     // the UI element.
-	void setStatusMessage(const std::string& msg);
+    void setStatusMessage(const std::string& msg);
+    void addStringToLogTab(const std::string& str, bool flash);
 
 	LLModelPreview*	mModelPreview;
 	
 	LLPhysicsDecomp::decomp_params mDecompParams;
+	LLPhysicsDecomp::decomp_params mDefaultDecompParams;
 	
 	S32				mLastMouseX;
 	S32				mLastMouseY;
@@ -202,7 +211,6 @@ protected:
 
 private:
 	void onClickCalculateBtn();
-	void toggleCalculateButton();
 
 	void onLoDSourceCommit(S32 lod);
 
@@ -212,10 +220,14 @@ private:
 	// resets display options of model preview to their defaults.
 	void resetDisplayOptions();
 
+	void resetUploadOptions();
+
 	void createSmoothComboBox(LLComboBox* combo_box, float min, float max);
 
 	LLButton* mUploadBtn;
 	LLButton* mCalculateBtn;
+	LLViewerTextEditor* mUploadLogText;
+	LLTabContainer* mTabContainer;
 };
 
 class LLMeshFilePicker : public LLFilePickerThread
@@ -310,6 +322,7 @@ public:
 	static bool 		sIgnoreLoadedCallback;
     std::vector<S32> mLodsQuery;
     std::vector<S32> mLodsWithParsingError;
+	bool mHasDegenerate;
 
 protected: