diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-15 17:12:42 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-15 17:12:42 -0400 |
| commit | d801628cb4fffc28f1d4a916351b13e5fdb50bc1 (patch) | |
| tree | aa17746812d569321a330b62e97d4a96cfe7eb7b | |
| parent | d2d95e96456d7810b6ab5051ed6f68395dfc917e (diff) | |
| parent | 79c4c1241b5acc8135ba3bc965ae1bb774cff49a (diff) | |
automated merge
| -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 |