diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-06-17 07:42:08 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-17 07:42:08 -0700 |
commit | 74817f151f3e5c2c0c179d13d1100974ed78fbd4 (patch) | |
tree | b198a5df57d362bfbd6c0617d14f5f7803ee5d6d /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
parent | 1c15d18175782f5afee9377af3f0b4ca9e2a4db8 (diff) | |
parent | 7cc006347822a70f36175dc2627814a0eaeb9c0a (diff) |
Merged from q/viewer-release
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 |