Commit Graph

78 Commits (84b179b0bf254ae039dfdba330d25ac2df1c0a67)

Author SHA1 Message Date
Richard Linden 84b179b0bf Automated merge with file:///F:\code\viewer-autobuild2010 2011-03-28 17:38:54 -07:00
callum b286a9091b SOCIAL-688 FIX Multiple SLurls error given in minimal skin when clicking links in web profile
Also fixes SOCIAL-521 and SOCIAL-428
2011-03-25 13:56:14 -07:00
alain@945battery-guestA-183.lindenlab.com 616b0a2568 Updated linux llqtwekit archive and fixed media webkit build and loading (fix CHOP-545). 2011-03-23 10:44:39 -07:00
callum b3e444c74e SOCIAL-634 FIX Error condition content for Destination Guide, Avatar Picker,
and Help if S3 content or web content is not available.
(Included refs to new LLQtWebKit that supports functionality)
2011-03-17 17:18:58 -07:00
Monroe Linden 5d6ccc5cde SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7
Reviewed by Callum
2010-12-21 16:38:06 -08:00
callum 88eabbd077 SOCIAL-311 PARTIAL FIX (2) Media browser has too many oddities to be useful for viewer web apps
Latest traunch of fixes to new Web only content floater
Also removed line in test app that fails to build - have a note to fix later
2010-12-01 19:02:53 -08:00
Monroe Linden 880110eb93 OCIAL-231 FIX Enable tooltips (for links and images)
Added the necessary plumbing to get link_hovered events from the webkit plugin through to the viewer UI.

This requires a llqtwebkit library built from revision 1799a899e06d or later in http://hg.secondlife.com/llqtwebkit to function.  The viewer source changes are backwards-compatible with earlier versions of llqtwebkit, it just won't see any link_hovered events with previous revisions.

Reviewed by Callum.
2010-12-01 18:15:59 -08:00
callum 1345cbb0ca SOCIAL-299 FIX Add *.lindenlab.com to trusted certificate authorities in WebKit
Reviewed by CB
2010-11-30 14:07:16 -08:00
Monroe Linden df8b87435f SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1
Added support to the webkit media plugin and llpluginclassmedia for passing through the auth request/response.  We still need an updated build of llqtwebkit for all platforms, as well as some UI work in the viewer to actually display the auth dialog.
2010-11-16 17:01:44 -08:00
callum e395644032 Trivial change to force a build in Team City. 2010-11-09 17:10:34 -08:00
callum ce613ce398 EXP-378 FIX Disable SSL cert errors in LLQtWebkit for testing purposes
(Monroe's code - I made a patch and copied it over from viewer-skylight branch)
2010-11-05 17:06:21 -07:00
Tofu Linden 0f391c6ac9 Backed out changeset acb451f83a9d
original commit log for acb451f83a9d was: "Temporary changes to allow the viewer to build against an older version of llqtwebkit.
NOTE: once updated builds of llqtwebkit are available on all platforms, this changeset should be backed out."

So, yes, I'm backing that out.
2010-09-23 13:46:00 +01:00
Monroe Linden 5626cc0ccf Temporary changes to allow the viewer to build against an older version of llqtwebkit.
NOTE: once updated builds of llqtwebkit are available on all platforms, this changeset should be backed out.
2010-09-22 16:25:47 -07:00
Monroe Linden 1c3b38cace Fix for EXP-78 (javascript window.open function with no size parameters opens a tiny window when all popups setting is enabled). 2010-09-17 16:39:22 -07:00
Monroe Linden 531b77a948 Enable web popups to specify size and position of the Media Browser window from javascript.
This includes a Mac build of llqtwebkit from the following sources:

revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a of http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 81ab5ae326f0 of http://hg.secondlife.com/llqtwebkit (currently head of the default branch)

Reviewed by Callum.
2010-09-15 14:39:42 -07:00
callum 22172ce23d EXP-56 - viewer side of support for file picker dialog requirement. 2010-09-13 14:59:05 -07:00
Monroe Linden 24f308caae Added support for a media plugin message that asks the viewer to open a file picker on the plugin's behalf.
Reviewed by Callum.
2010-09-10 16:43:35 -07:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Monroe Linden a2657be578 Viewer side changes to support javascript window.close handling. 2010-08-17 17:56:54 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden 68c5a7f25c EXT-7889 FIXED Linux fails to load splash screen and side panel home tab. 2010-06-22 12:20:45 +01:00
Tofu Linden 81597463be hairy merge of glib restoration 2010-06-22 11:11:58 +01:00
Tofu Linden 7295e1ee03 EXT-7889 PARTIAL Linux fails to load splash screen and side panel home tab.
Start to restore manual glib handling.

Backed out changeset ff86a9f5b917
2010-06-22 11:07:35 +01:00
Monroe Linden 79c4c1241b Enable the call to LLQtWebKit::setWindowOpenBehavior() on Linux, since the llqtwebkit build has been updated. 2010-06-15 14:11:26 -07:00
Monroe Linden 79f697ad51 Fix for EXT-5667 (support window.open() in shared media so google docs will work).
Moved the processing of clicks on _external and _blank targeted links from LLMediaCtrl to LLViewerMediaImpl.

Removed LLMediaCtrl::setOpenInExternalBrowser() since that functionality is available through the use of the _external target attribute in web content.

Removed LLMediaCtrl:: setOpenInInternalBrowser() since it was unimplemented and not used.

Made the webkit media plugin set llqtwebkit's window open behavior to WOB_SIMULATE_BLANK_HREF_CLICK.  This is #ifdefed out on Linux until we get a new Linux build of llqtwebkit.
2010-05-21 15:36:12 -07:00
Monroe Linden db3641363d Set up volume control code in webkit plugin for platform-specific implementations
Renamed LinuxVolumeCatcher class to VolumeCatcher.  Everything in the header except the class name was already platform-agnostic, so I just renamed it to volume_catcher.h.

Moved the stub implementation from the end of linux_volume_catcher.cpp (previously only used if LL_PULSEAUDIO_ENABLED was not defined) to dummy_volume_catcher.cpp, and made CMakeList.txt file use the dummy impl on Linux if PULSEAUDIO is not defined.

Removed the ifdefs on the use of VolumeCatcher in MediaPluginWebkit, so it gets called on all platforms.

Added a setPan() function to VolumeCatcher (currently unimplemented, but we'd like to have this capability in the future).
2010-04-09 12:34:24 -07:00
Monroe Linden e1517318c5 Fix for EXT-6615 (SL webkit no longer reports "Second Life" in the HTTP_USER_AGENT)
The issue here is that initBrowserWindow() was doing the wrong thing if it got called after the set_user_agent message was received.

Made the handler for the set_user_agent message save the string in a member variable (mUserAgent).

Initialize mUserAgent to the default string in the MediaPluginWebKit constructor.

initBrowserWindow() now sets the user agent string from mUserAgent instead of from a literal.
2010-03-29 18:36:47 -07:00
Monroe Linden 4e7838fb00 Implemented central storage mechanism for media plugin cookies.
Added LLPluginCookieStore, which manages the central list of cookies.

New Mac and Windows versions of llqtwebkit, built from the tip of the cookie-api branch on http://bitbucket.org/lindenlab/llqtwebkit/ (currently revision f35a5eab8c2f).

Added "set_cookies" and "cookie_set" messages to the media_browser message class in the plugin API, and made the webkit plugin use them appropriately.

Added methods to LLViewerMedia to read/write the cookie file and add/remove individual cookies.

Added hooks to read/write the cookie file (plugin_cookies.txt) in the same places as  the location history (idle_startup() in llstartup.cpp and LLAppViewer::cleanup(), respectively).

Reviewed by Richard at http://codereview.lindenlab.com/1006003
2010-03-26 15:39:21 -07:00
Callum Prentice cb7fbc8a20 EXT-6466 "Move "Enable Cookies" checkbox...", EXT-6402 "Add feature to disable Web plugins via prefs" and EXT-6401 "Add feature to disable Javascript via prefs"
Apologies for the multiple commit of Jiras - these changes are closely related and impossible to commit deparately
Reviewed by Monroe
2010-03-18 16:53:27 -07:00
Monroe Linden ce242821dc Added an "init" message in LLPLUGIN_MESSAGE_CLASS_MEDIA, and made LLPluginClassMedia queue it up before initializing its LLPluginProcessParent.
Made all existing plugins send their texture_params message from this init message instead of the LLPLUGIN_MESSAGE_CLASS_BASE "init" message.  (This ensures that they won't start to receive 'size_change' messages until after the init has happened.)
Added "set_user_data_path" and "set_language_code" messages to LLPluginClassMedia.
Made webkit plugin deal with the new messages, when they're sent before it receives the media "init".
Removed the user_data_path and language_code arguments from the init function calls throughout the hierarchy.
Made LLViewerMediaImpl queue up the language code and user data path messages before initializing the media.

Reviewed by Callum at http://codereview.lindenlab.com/687006 .
2010-03-16 16:42:31 -07:00
Monroe Linden 6079a50186 New linux build of llqtwebkit.
Also, disabled LL_QTWEBKIT_USES_PIXMAPS define in media_plugin_webkit.cpp as the QPixmap changes have been backed out of the llqtwebkit build for now.
2010-03-12 13:49:40 -08:00
Tofu Linden 7498504c92 EXT-5969 build and merge a shippable pixmap-based llqtwebkit for viewer2.0/linux
Maybe also: EXT-4495 flash content crashes Webkit on Linux
2010-03-04 17:22:22 +00:00
Tofu Linden 496e6e1948 Add #if'd code that can deal with the newer QPixmap-based LLQtWebkits.
Disabled for now.
2010-03-04 14:30:57 +00:00
Tofu Linden 15513ff6d7 trivial cleanup. 2010-02-22 16:20:57 +00:00
Tofu Linden df43c0e18b Wire the linux volume catcher into the webkit plugin. 2010-02-22 14:08:15 +00:00
Tofu Linden 6d08400145 EXT-3651 DEV-44500 Keyboard interaction does not work with Flash media
This change lets Linux pass keys through to Flash.
2010-02-09 18:19:35 +00:00
Tofu Linden c920a71240 merge 2010-02-09 15:08:10 +00:00
Tofu Linden b0791c3001 Backed out changeset 0664cf2c9edf 2010-02-09 15:07:45 +00:00
Tofu Linden c66e9199a5 Backed out changeset b1c241040751 2010-02-09 14:52:13 +00:00
Tofu Linden 5abb6dece7 HACK HACK HACK to unbreak linux build while I wait for access to the new llqtwebkit code.
only affects linux.  may harm webkit functionality temporarily.  to be backed-out.
2010-02-09 14:00:33 +00:00
Monroe Linden 3699be5c45 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-02-05 18:38:16 -08:00
Monroe Linden 8b0ae67e73 Changed LLWindowWin32::getNativeKeyData() to use platform-specific names in the key data.
Changed MediaPluginWebkit::deserializeKeyboardData() to use platform-specific names when extracting the key data.  Also fixed a mac-specific issue where the arguments were reversed, which was causing flash apps to get bad keycode data.

Just pass 0 for the "native modifiers" param on windows, since it doesn't seem to actually have a native notion of a "modifier keys mask".  The Qt (non-native) modifiers should be good enough.
2010-02-05 18:23:16 -08:00
Tofu Linden f9f6f1958d EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event
This should be a lot better now.  But still not good overall.  Performance is now just bad instead of intolerable.
2010-02-05 09:01:58 +00:00
Callum Prentice 259fa5fd0b Merge with tip 2010-02-04 17:03:41 -08:00
Callum Prentice 80139d95ad added code to grab raw key codes from Win32 WPARAM and LPARAM and send to plugin
factored out keyboard message deserialization for media_plugin_webkit
new version of llqtwebkit with Girish's changes to keyboard and cursor handling code
2010-02-04 16:30:21 -08:00
Tofu Linden c0422e1c6c CID-284
Checker: UNINIT_CTOR
Function: MediaPluginWebKit::MediaPluginWebKit(void (*)(const char *, void **), void *)
File: /indra/media_plugins/webkit/media_plugin_webkit.cpp
2010-02-03 19:06:06 +00:00
Monroe Linden a4aed31ad9 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-01-29 14:49:18 -08:00
Monroe Linden 572b8fc518 Changes to llqtwebkit keyboard event api.
Reference to new mac build of llqtwebkit (from revision 5e61bf24915f in https://hg.lindenlab.com/monroe/llqtwebkit-4.6).
2010-01-19 21:55:51 -08:00
Monroe Linden c3b8a84d3c Workaround for "Stop on Debugger()/DebugStr()" Xcode setting causing the webkit plugin to crash. 2010-01-19 14:31:27 -08:00
Monroe Linden fae9c8fe86 Added getNativeKeyData() function to LLWindow and LLWindowMacOSX.
Added an LLSD argument to LLPluginClassMedia::keyEvent() and LLPluginClassMedia::textInput() which contains the native key data.
Made LLViewerMediaImpl retrieve the native key data and pass it to keyEvent and textInput.
Added a native_key_data parameter to the text_event and key_event messages.
Made the webkit plugin extract the native_key_data parameter and pass it to the internal keyEvent() and unicodeInput() functions.
Fixed LLMediaPluginTest to match function signature change to LLPluginClassMedia::keyEvent().
2010-01-18 17:58:12 -08:00