From 6175e8147ff85073c67de89f08e5ecea891e1ef8 Mon Sep 17 00:00:00 2001
From: leyla_linden <none@none>
Date: Tue, 21 Dec 2010 17:01:03 -0800
Subject: fixed wizard model not previewing issues and added pan/zoom

---
 indra/newview/llfloatermodelpreview.cpp | 50 +++++++++++++++++----------------
 1 file changed, 26 insertions(+), 24 deletions(-)

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

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 85d0ae02cf..0dc021c44b 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -3339,13 +3339,38 @@ void LLModelPreview::updateStatusMessages()
 
 		
 	}
-	else if (mFMP->childGetValue("lod_auto_generate").asBoolean())
+	else if (mFMP->childGetValue("lod_none").asBoolean())
 	{
 		for (U32 i = 0; i < num_file_controls; ++i)
 		{
 			mFMP->childDisable(file_controls[i]);
 		}
 
+		for (U32 i = 0; i < num_lod_controls; ++i)
+		{
+			mFMP->childDisable(lod_controls[i]);
+		}
+
+		if (!mModel[mPreviewLOD].empty())
+		{
+			mModel[mPreviewLOD].clear();
+			mScene[mPreviewLOD].clear();
+			mVertexBuffer[mPreviewLOD].clear();
+
+			//this can cause phasing issues with the UI, so reenter this function and return
+			updateStatusMessages();
+			return;
+		}
+		
+	
+	}
+	else
+	{	// auto generate, also the default case for wizard which has no radio selection
+		for (U32 i = 0; i < num_file_controls; ++i)
+		{
+			mFMP->childDisable(file_controls[i]);
+		}
+
 		for (U32 i = 0; i < num_lod_controls; ++i)
 		{
 			mFMP->childEnable(lod_controls[i]);
@@ -3380,29 +3405,6 @@ void LLModelPreview::updateStatusMessages()
 			}
 		}
 	}
-	else
-	{ // "None" is chosen
-		for (U32 i = 0; i < num_file_controls; ++i)
-		{
-			mFMP->childDisable(file_controls[i]);
-		}
-
-		for (U32 i = 0; i < num_lod_controls; ++i)
-		{
-			mFMP->childDisable(lod_controls[i]);
-		}
-
-		if (!mModel[mPreviewLOD].empty())
-		{
-			mModel[mPreviewLOD].clear();
-			mScene[mPreviewLOD].clear();
-			mVertexBuffer[mPreviewLOD].clear();
-
-			//this can cause phasing issues with the UI, so reenter this function and return
-			updateStatusMessages();
-			return;
-		}
-	}
 
 	if (mFMP->childGetValue("physics_load_from_file").asBoolean())
 	{
-- 
cgit v1.2.3