From 6cb3d25942bc2dc67f41efedb3a90db1b559b3b9 Mon Sep 17 00:00:00 2001 From: callum Date: Wed, 16 Dec 2009 13:10:03 -0800 Subject: Merge with tip --- indra/media_plugins/webkit/media_plugin_webkit.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp') diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 707edaa3d6..844da76042 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -205,7 +205,6 @@ private: { // create single browser window mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight ); - #if LL_WINDOWS // Enable plugins LLQtWebKit::getInstance()->enablePlugins(true); @@ -216,7 +215,9 @@ private: // Disable plugins LLQtWebKit::getInstance()->enablePlugins(false); #endif - + // Enable cookies + LLQtWebKit::getInstance()->enableCookies( true ); + // tell LLQtWebKit about the size of the browser window LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight ); -- cgit v1.2.3 From b7ddd2e4fec6ea553b0b3d17e6ece987a6bcdd7a Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Thu, 17 Dec 2009 17:05:04 -0800 Subject: Fix a code comment now that we enable NSAPI plugins under Darwin. --- indra/media_plugins/webkit/media_plugin_webkit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp') diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 844da76042..2ce295a4b2 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -209,7 +209,7 @@ private: // Enable plugins LLQtWebKit::getInstance()->enablePlugins(true); #elif LL_DARWIN - // Disable plugins + // Enable plugins LLQtWebKit::getInstance()->enablePlugins(true); #elif LL_LINUX // Disable plugins -- cgit v1.2.3 From d8a574ce57bc7eb4efb643449c2815e1c3aee94e Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Thu, 17 Dec 2009 17:43:31 -0800 Subject: DEV-43898 Enable Flash-on-a-prim on Linux. Yowza! --- indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp') diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 2ce295a4b2..7be2385fd5 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -212,8 +212,8 @@ private: // Enable plugins LLQtWebKit::getInstance()->enablePlugins(true); #elif LL_LINUX - // Disable plugins - LLQtWebKit::getInstance()->enablePlugins(false); + // Enable plugins + LLQtWebKit::getInstance()->enablePlugins(true); #endif // Enable cookies LLQtWebKit::getInstance()->enableCookies( true ); -- cgit v1.2.3