From 8bc05f6d15d096b33cb9d28e9701923280ed2594 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 14 Jan 2013 00:04:43 +0100
Subject: [PATCH] Fix double upload dialog

---
 indra/newview/llfloatermodelpreview.cpp | 27 +++++++++----------------
 indra/newview/llviewermenufile.cpp      | 13 +++---------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index c7c12311f..64e506900 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -123,66 +123,59 @@ const S32 SMOOTH_VALUES_NUMBER = 10;
 
 void drawBoxOutline(const LLVector3& pos, const LLVector3& size);
 
-std::string lod_name[NUM_LOD + 1] =
+std::string lod_name[NUM_LOD] =
 {
 	"lowest",
 	"low",
 	"medium",
 	"high",
-	"I went off the end of the lod_name array.  Me so smart."
 };
 
-std::string lod_triangles_name[NUM_LOD + 1] =
+std::string lod_triangles_name[NUM_LOD] =
 {
 	"lowest_triangles",
 	"low_triangles",
 	"medium_triangles",
 	"high_triangles",
-	"I went off the end of the lod_triangles_name array.  Me so smart."
 };
 
-std::string lod_vertices_name[NUM_LOD + 1] =
+std::string lod_vertices_name[NUM_LOD] =
 {
 	"lowest_vertices",
 	"low_vertices",
 	"medium_vertices",
 	"high_vertices",
-	"I went off the end of the lod_vertices_name array.  Me so smart."
 };
 
-std::string lod_status_name[NUM_LOD + 1] =
+std::string lod_status_name[NUM_LOD] =
 {
 	"lowest_status",
 	"low_status",
 	"medium_status",
 	"high_status",
-	"I went off the end of the lod_status_name array.  Me so smart."
 };
 
-std::string lod_icon_name[NUM_LOD + 1] =
+std::string lod_icon_name[NUM_LOD] =
 {
 	"status_icon_lowest",
 	"status_icon_low",
 	"status_icon_medium",
 	"status_icon_high",
-	"I went off the end of the lod_status_name array.  Me so smart."
 };
 
-std::string lod_status_image[NUM_LOD + 1] =
+std::string lod_status_image[NUM_LOD] =
 {
-	"ModelImport_Status_Good",
-	"ModelImport_Status_Warning",
-	"ModelImport_Status_Error",
-	"I went off the end of the lod_status_image array.  Me so smart."
+	"green_checkmark.png",
+	"lag_status_warning.tga",
+	"red_x.png",
 };
 
-std::string lod_label_name[NUM_LOD + 1] =
+std::string lod_label_name[NUM_LOD] =
 {
 	"lowest_label",
 	"low_label",
 	"medium_label",
 	"high_label",
-	"I went off the end of the lod_label_name array.  Me so smart."
 };
 
 std::string colladaVersion[VERSIONTYPE_COUNT + 1] = 
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 428e9599c..7eb89b582 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -310,24 +310,17 @@ class LLFileUploadImage : public view_listener_t, public AIFileUpload
 	}
 };
 
-class LLFileUploadModel : public view_listener_t, public AIFileUpload
+class LLFileUploadModel : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		start_filepicker(FFLOAD_COLLADA, "mesh");
-		return true;
-	}
-
-  protected:
-	// Inherited from AIFileUpload.
-	/*virtual*/ void handle_event(std::string const& filename)
-	{
-		LLFloaterModelPreview* fmp = new LLFloaterModelPreview(filename);
+		LLFloaterModelPreview* fmp = new LLFloaterModelPreview("Model Preview");
 		LLUICtrlFactory::getInstance()->buildFloater(fmp, "floater_model_preview.xml");
 		if (fmp)
 		{
 			fmp->loadModel(3);
 		}
+		return true;
 	}
 };