diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-18 14:38:46 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-18 14:38:46 +0200 |
| commit | 198587423d0eb343c6091d9af97e4ad12860166e (patch) | |
| tree | 18922a60b34b16bdb4df6941850d5565b7cb1d72 /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | 3bf89afebec3c535604789f0e2997598ac43bbe6 (diff) | |
| parent | 2a49de3befff5e2b48a273f70a21f525b50a189c (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 707edaa3d6..7be2385fd5 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -205,18 +205,19 @@ private: { // create single browser window mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight ); - #if LL_WINDOWS // Enable plugins LLQtWebKit::getInstance()->enablePlugins(true); #elif LL_DARWIN - // Disable plugins + // 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 ); + // tell LLQtWebKit about the size of the browser window LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight ); |