diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 4b086f808..b79249860 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -682,9 +682,16 @@ void LLViewerMediaImpl::navigateTo(const std::string& url, const std::string& mi
 		LLURI uri(url);
 		std::string scheme = uri.scheme();
 
-		if(scheme.empty() || "http" == scheme || "https" == scheme)
+		if(scheme.empty() || ("http" == scheme || "https" == scheme))
 		{
-			LLHTTPClient::getHeaderOnly( url, new LLMimeDiscoveryResponder(this));
+			if(mime_type.empty())
+			{
+				LLHTTPClient::getHeaderOnly( url, new LLMimeDiscoveryResponder(this));
+			}
+			else if(initializeMedia(mime_type) && (plugin = getMediaPlugin()))
+			{
+				plugin->loadURI( url );
+			}
 		}
 		else if("data" == scheme || "file" == scheme || "about" == scheme)
 		{
diff --git a/indra/newview/statemachine/aifilepicker.cpp b/indra/newview/statemachine/aifilepicker.cpp
index 19b3af0d4..38cbf6996 100644
--- a/indra/newview/statemachine/aifilepicker.cpp
+++ b/indra/newview/statemachine/aifilepicker.cpp
@@ -100,7 +100,7 @@ std::string AIFilePicker::get_folder(std::string const& default_path, std::strin
 	{
 		// This is the last resort when all else failed. Open the file chooser in directory 'home'.
 #if LL_WINDOWS
-		char const* envname = "HOMEPATH";
+		char const* envname = "USERPROFILE";
 #else
 		char const* envname = "HOME";
 #endif