Merge branch 'master' into DRTVWR-486

1 files changed, 20 insertions, 3 deletions

diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 0affe8efb4..5393d0b0b7 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -46,6 +46,7 @@
 #include "lluictrlfactory.h"	// LLDefaultChildRegistry
 #include "llkeyboard.h"
 #include "llviewermenu.h"
+#include "llviewermenufile.h" // LLFilePickerThread
 
 // linden library includes
 #include "llfocusmgr.h"
@@ -105,7 +106,8 @@ LLMediaCtrl::LLMediaCtrl( const Params& p) :
 	mTrusted(p.trusted_content),
 	mWindowShade(NULL),
 	mHoverTextChanged(false),
-	mContextMenu(NULL)
+	mContextMenu(NULL),
+    mAllowFileDownload(false)
 {
 	{
 		LLColor4 color = p.caret_color().get();
@@ -1129,8 +1131,23 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 
 		case MEDIA_EVENT_FILE_DOWNLOAD:
 		{
-			//llinfos << "Media event - file download requested - filename is " << self->getFileDownloadFilename() << llendl;
-			//LLNotificationsUtil::add("MediaFileDownloadUnsupported");
+            if (mAllowFileDownload)
+            {
+                // pick a file from SAVE FILE dialog
+                // for now the only thing that should be allowed to save is 360s
+                std::string suggested_filename = self->getFileDownloadFilename();
+                LLFilePicker::ESaveFilter filter = LLFilePicker::FFSAVE_ALL;
+                if (suggested_filename.find(".jpg") != std::string::npos || suggested_filename.find(".jpeg") != std::string::npos)
+                    filter = LLFilePicker::FFSAVE_JPEG;
+                if (suggested_filename.find(".png") != std::string::npos)
+                    filter = LLFilePicker::FFSAVE_PNG;
+
+                (new LLMediaFilePicker(self, filter, suggested_filename))->getFile();
+            }
+            else
+            {
+                LLNotificationsUtil::add("MediaFileDownloadUnsupported");
+            }
 		};
 		break;