diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index da1d029bdb73a8e342651543da8645213f03bfbb..b314c788390ad1762bbb54b6473cd14ba7f54aa5 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -3212,7 +3212,6 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla
             //unblock media plugin
             const std::vector<std::string> empty_response;
             plugin->sendPickFileResponse(empty_response);
-            LLNotificationsUtil::add("MediaFileDownloadUnsupported");
 		}
 		break;
 
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index ca5305b169369abc17013a1557b286ef02b536e7..dd4c326721d2e341e254cbaba98993d40e8d10f3 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -71,6 +71,8 @@
 #include "llmediaentry.h"
 #include "llmediadataclient.h"
 #include "llmeshrepository.h"
+#include "llnotifications.h"
+#include "llnotificationsutil.h"
 #include "llagent.h"
 #include "llviewermediafocus.h"
 #include "lldatapacker.h"
@@ -2960,6 +2962,10 @@ void LLVOVolume::mediaEvent(LLViewerMediaImpl *impl, LLPluginClassMedia* plugin,
 			}
 		}
 		break;
+
+        case LLViewerMediaObserver::MEDIA_EVENT_FILE_DOWNLOAD:
+            LLNotificationsUtil::add("MediaFileDownloadUnsupported");
+            break;
 		
 		default:
 		break;