diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-16 15:25:40 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-16 15:25:40 +0300 |
| commit | 9cb1fcec6d52933f01426aec4e6a3f1b6774632c (patch) | |
| tree | ac6b0a5ddb280db610162dece01166905d46b60e /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | b9a468aff6b4b9bdaf4ac0ab2a309902c6c203ed (diff) | |
| parent | 9ee5a62332353db6a098628e69732d2723cc5deb (diff) | |
Merge from default branch
--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 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 0cd6e48d14..6990354486 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -297,11 +297,8 @@ private: // append details to agent string LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent ); - // TODO: Remove this ifdef when the Linux version of llqtwebkit gets updated with the new WOB constant. -#if !LL_LINUX // Set up window open behavior LLQtWebKit::getInstance()->setWindowOpenBehavior(mBrowserWindowId, LLQtWebKit::WOB_SIMULATE_BLANK_HREF_CLICK); -#endif #if !LL_QTWEBKIT_USES_PIXMAPS // don't flip bitmap |