diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 10:21:52 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 10:21:52 -0700 |
| commit | c8970618567e867b619c9fb5e225978bc5f66781 (patch) | |
| tree | d5ec9d2f27d887e9a39b1109469ca405b14c6a85 /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | 6be9f280ff5b2e2eba3bb9c3f14d7166579d1a49 (diff) | |
| parent | a069e0d3db0e0771e54768a702fa18e57415992e (diff) | |
Merge with 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 |