Sync LLViewerMediaImpl::newSourceFromMediaType with SG2

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

3 files changed, 82 insertions, 16 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 57ed4c0..417ddc3 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2612,6 +2612,39 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>BrowserCookiesEnabled</key>
+  <map>
+    <key>Comment</key>
+    <string>Accept cookies from Web sites?</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>BrowserJavascriptEnabled</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable Javascript in the built-in Web browser?</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>BrowserPluginsEnabled</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable Web plugins in the built-in Web browser?</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>BrowserProxyAddress</key>
   <map>
     <key>Comment</key>
@@ -4050,17 +4083,6 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>CookiesEnabled</key>
-  <map>
-    <key>Comment</key>
-    <string>Accept cookies from Web sites?</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>CreateToolCopyCenters</key>
   <map>
     <key>Comment</key>
@@ -8460,6 +8482,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>PluginAttachDebuggerToPlugins</key>
+    <map>
+      <key>Comment</key>
+      <string>If true, attach a debugger session to each plugin process as it's launched.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>PrecachingDelay</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llpanelweb.cpp b/linden/indra/newview/llpanelweb.cpp
index e2933f0..14df239 100644
--- a/linden/indra/newview/llpanelweb.cpp
+++ b/linden/indra/newview/llpanelweb.cpp
@@ -68,7 +68,7 @@ BOOL LLPanelWeb::postBuild()
         std::string value = gSavedSettings.getBOOL("UseExternalBrowser") ? "external" : "internal";
         childSetValue("use_external_browser", value);
 
-        childSetValue("cookies_enabled", gSavedSettings.getBOOL("CookiesEnabled"));
+        childSetValue("cookies_enabled", gSavedSettings.getBOOL("BrowserCookiesEnabled"));
 
         childSetValue("web_proxy_enabled", gSavedSettings.getBOOL("BrowserProxyEnabled"));
         childSetValue("web_proxy_editor", gSavedSettings.getString("BrowserProxyAddress"));
@@ -101,7 +101,7 @@ LLPanelWeb::~LLPanelWeb()
 
 void LLPanelWeb::apply()
 {
-        gSavedSettings.setBOOL("CookiesEnabled", childGetValue("cookies_enabled"));
+        gSavedSettings.setBOOL("BrowserCookiesEnabled", childGetValue("cookies_enabled"));
         gSavedSettings.setBOOL("BrowserProxyEnabled", childGetValue("web_proxy_enabled"));
         gSavedSettings.setString("BrowserProxyAddress", childGetValue("web_proxy_editor"));
         gSavedSettings.setS32("BrowserProxyPort", childGetValue("web_proxy_port"));
@@ -224,4 +224,4 @@ void LLPanelWeb::onClickClear(void* user_data)
 {
         LLPanelWeb* self = (LLPanelWeb*)user_data;
         self->childSetValue("world_search_editor","") ;
-}
\ No newline at end of file
+}
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;
 }