diff options
| author | skolb <none@none> | 2009-12-17 09:38:52 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-17 09:38:52 -0800 |
| commit | c9a70e867535e734b7f1e55c5b2234cb2bb1691d (patch) | |
| tree | 2790c5bd8005ca104efc49379f990c7ff49c399f /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | cbbd8dcf22f9629529b11c4c86fd9271dfaa5e24 (diff) | |
| parent | 9cec9513945036ad08d81c90ed325e28370209f2 (diff) | |
Merge
Diffstat (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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 ); |