1 files changed, 22 insertions, 7 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index f5b41d3179..28ff69eaf5 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -46,6 +46,7 @@
 #include "llimagejpeg.h"
 #include "llimagetga.h"
 #include "llinventorymodel.h"	// gInventory
+#include "llpluginclassmedia.h"
 #include "llresourcedata.h"
 #include "lltoast.h"
 #include "llfloaterperms.h"
@@ -251,6 +252,25 @@ void LLFilePickerReplyThread::notify(const std::vector<std::string>& filenames)
 	}
 }
 
+
+LLMediaFilePicker::LLMediaFilePicker(LLPluginClassMedia* plugin, LLFilePicker::ELoadFilter filter, bool get_multiple)
+    : LLFilePickerThread(filter, get_multiple),
+    mPlugin(plugin->getSharedPrt())
+{
+}
+
+LLMediaFilePicker::LLMediaFilePicker(LLPluginClassMedia* plugin, LLFilePicker::ESaveFilter filter, const std::string &proposed_name)
+    : LLFilePickerThread(filter, proposed_name),
+    mPlugin(plugin->getSharedPrt())
+{
+}
+
+void LLMediaFilePicker::notify(const std::vector<std::string>& filenames)
+{
+    mPlugin->sendPickFileResponse(mResponses);
+    mPlugin = NULL;
+}
+
 //============================================================================
 
 #if LL_WINDOWS
@@ -549,13 +569,8 @@ class LLFileUploadModel : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		LLFloaterModelPreview* fmp = (LLFloaterModelPreview*) LLFloaterReg::getInstance("upload_model");
-		if (fmp && !fmp->isModelLoading())
-		{
-			fmp->loadHighLodModel();
-		}
-		
-		return TRUE;
+        LLFloaterModelPreview::showModelPreview();
+        return TRUE;
 	}
 };