diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2009-08-29 01:08:36 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2009-08-29 01:08:36 +0000 |
| commit | 558897b4b90635f729a6264daecfe14752a12ceb (patch) | |
| tree | 5bccb59f474deb1099cceb74a4b0a44acaf1efc6 /indra | |
| parent | 0aa2bc4831674e61edf680887eba9acec9f997ed (diff) | |
svn merge -r 132139:132140 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-5
In the webkit plugin, don't try to load web browser plugins except on Windows. The flash plugin on the Mac crashes the webkit plugin when running under xcode.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index bd29eb5395..72827689a3 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -145,8 +145,13 @@ private: // create single browser window mBrowserWindowId = LLMozLib::getInstance()->createBrowserWindow( mWidth, mHeight ); +#if LL_WINDOWS // Enable plugins LLMozLib::getInstance()->enablePlugins(true); +#else + // Disable plugins + LLMozLib::getInstance()->enablePlugins(false); +#endif // tell LLMozLib about the size of the browser window LLMozLib::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight ); |