Sync LLViewerMediaImpl::newSourceFromMediaType with SG2

Also renamed CookiesEnabled to BrowswerCookiesEnabled.
Added BrowserJavascriptEnabled, BrowserPluginsEnabled and
PluginAttachDebuggerToPlugins.

1 files changed, 35 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 8c5cf6a..57c2111 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -466,6 +466,19 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
                 std::string user_data_path = gDirUtilp->getOSUserAppDir();
                 user_data_path += gDirUtilp->getDirDelimiter();
 
+                // Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.)
+                // If the linden username returned is blank, that can only mean we are
+                // at the login page displaying login Web page or Web browser test via Develop menu.
+                // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this
+                // is what we always used before this change)
+                std::string linden_user_dir = gDirUtilp->getLindenUserDir();
+                if ( ! linden_user_dir.empty() )
+                {
+                        // gDirUtilp->getLindenUserDir() is whole path, not just Linden name
+                        user_data_path = linden_user_dir;
+                        user_data_path += gDirUtilp->getDirDelimiter();
+                }
+
                 // See if the plugin executable exists
                 llstat s;
                 if(LLFile::stat(launcher_name, &s))
@@ -480,7 +493,22 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
                 {
                         LLPluginClassMedia* media_source = new LLPluginClassMedia(owner);
                         media_source->setSize(default_width, default_height);
-                        if (media_source->init(launcher_name, plugin_name, false))
+                        media_source->setUserDataPath(user_data_path);
+                        media_source->setLanguageCode(LLUI::getLanguage());
+
+                        // collect 'cookies enabled' setting from prefs and send to embedded browser
+                        bool cookies_enabled = gSavedSettings.getBOOL( "BrowserCookiesEnabled" );
+                        media_source->enable_cookies( cookies_enabled );
+
+                        // collect 'plugins enabled' setting from prefs and send to embedded browser
+                        bool plugins_enabled = gSavedSettings.getBOOL( "BrowserPluginsEnabled" );
+                        media_source->setPluginsEnabled( plugins_enabled );
+
+                        // collect 'javascript enabled' setting from prefs and send to embedded browser
+                        bool javascript_enabled = gSavedSettings.getBOOL( "BrowserJavascriptEnabled" );
+                        media_source->setJavascriptEnabled( javascript_enabled );
+
+                        if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins")))
                         {
                                 return media_source;
                         }
@@ -491,7 +519,12 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
                         }
                 }
         }
-        
+
+        LL_WARNS("Plugin") << "plugin intialization failed for mime type: " << media_type << LL_ENDL;
+        LLSD args;
+        args["MIME_TYPE"] = media_type;
+        LLNotifications::instance().add("NoPlugin", args);
+
         return NULL;
 }