From e7f3f3bdbbec310030209e09d389cd434adb7991 Mon Sep 17 00:00:00 2001
From: leyla_linden <none@none>
Date: Mon, 20 Dec 2010 17:32:05 -0800
Subject: model upload wizard - added optimization and state changes

---
 indra/newview/llfloatermodelpreview.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llfloatermodelpreview.h')

diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index ae4cf18fee..64b220d86b 100755
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -52,6 +52,8 @@ class domTranslate;
 class LLMenuButton;
 class LLToggleableMenu;
 
+const S32 NUM_LOD = 4;
+
 class LLModelLoader : public LLThread
 {
 public:
@@ -258,7 +260,7 @@ class LLModelPreview : public LLViewerDynamicTexture, public LLMutex
 	void clearModel(S32 lod);
 	void loadModel(std::string filename, S32 lod);
 	void loadModelCallback(S32 lod);
-	void genLODs(S32 which_lod = -1);
+	void genLODs(S32 which_lod = -1, U32 decimation = 3);
 	void generateNormals();
 	void consolidate();
 	void clearMaterials();
-- 
cgit v1.2.3


From e1b1db9575945fa8436b4ebabf55242635b61f38 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 22 Dec 2010 01:05:35 -0600
Subject: SH-636 Update physics tab to new spec, move "completed" physics
 decomp callbacks to main thread, add object model to decomposition tool, make
 imported model scales non-uniform.

---
 indra/newview/llfloatermodelpreview.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llfloatermodelpreview.h')

diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index e233f3672a..f7873cddbb 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -199,6 +199,8 @@ protected:
 	
 	void initDecompControls();
 	
+	void setStatusMessage(const std::string& msg);
+
 	LLModelPreview*	mModelPreview;
 	
 	LLPhysicsDecomp::decomp_params mDecompParams;
@@ -209,8 +211,9 @@ protected:
 	U32				mGLName;
 	static S32		sUploadAmount;
 	
-	LLPointer<DecompRequest> mCurRequest;
-	
+	std::set<LLPointer<DecompRequest> > mCurRequest;
+	std::string mStatusMessage;
+
 	std::map<std::string, bool> mViewOption;
 
 	//use "disabled" as false by default
@@ -218,7 +221,7 @@ protected:
 
 	LLMenuButton* mViewOptionMenuButton;
 	LLToggleableMenu* mViewOptionMenu;
-	
+	LLMutex* mStatusLock;
 };
 
 class LLMeshFilePicker : public LLFilePickerThread
-- 
cgit v1.2.3


From 8ba0baa63109d5e45c1f3cfd75c7d230ff99031f Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Wed, 22 Dec 2010 10:55:48 -0700
Subject: fix for SH-648: Crash on exit in LLViewerFetchedTexture (ref count
 error)

---
 indra/newview/llfloatermodelpreview.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llfloatermodelpreview.h')

diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 64b220d86b..623cd286fb 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -52,7 +52,7 @@ class domTranslate;
 class LLMenuButton;
 class LLToggleableMenu;
 
-const S32 NUM_LOD = 4;
+const S32 NUM_LOD = 4;
 
 class LLModelLoader : public LLThread
 {
-- 
cgit v1.2.3


From 07d3480ec35a9a5bade25acb99fc39935bad38a2 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 22 Dec 2010 15:18:55 -0600
Subject: SH-658 Preserve LOD mode when switching between preview LoDs.

---
 indra/newview/llfloatermodelpreview.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llfloatermodelpreview.h')

diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 8c7ab39e55..9b908eafee 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -194,9 +194,7 @@ protected:
 	static void onPhysicsOptimize(LLUICtrl* ctrl, void* userdata);
 	static void onPhysicsDecomposeBack(LLUICtrl* ctrl, void* userdata);
 	static void onPhysicsSimplifyBack(LLUICtrl* ctrl, void* userdata);
-	
-	
-	
+		
 	void			draw();
 	
 	void initDecompControls();
@@ -220,6 +218,12 @@ protected:
 
 	//use "disabled" as false by default
 	std::map<std::string, bool> mViewOptionDisabled;
+	
+	//store which lod mode each LOD is using
+	// 0 - load from file
+	// 1 - auto generate
+	// 2 - None
+	S32 mLODMode[4];
 
 	LLMenuButton* mViewOptionMenuButton;
 	LLToggleableMenu* mViewOptionMenu;
-- 
cgit v1.2.3