Commit Graph

238 Commits (8485bff29b98f47954b78b31b2e0511f94de3be4)

Author SHA1 Message Date
ziree 0e292c93f1 Separated parcel audio streams from parcel/prim media controls. 2011-05-15 01:45:37 +02:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00
Arrehn 46c6d5e3d0 Moved "block scripted media" further up the call chain to llviewerparcelmedia to avoid it catching internal requests. 2011-03-06 14:09:14 -05:00
Arrehn 3bb53af46e merge 2011-03-03 23:02:19 -05:00
Arrehn c9cde51cc4 Option to allow users to disable LSL scripted media. 2011-03-03 22:13:45 -05:00
Tonya Souther 8b7c5ac3ce Part 1 of the media filter patch. Originally written for Phoenix by Sione Lomu, reworked for Firestorm by Tonya Souther. 2011-03-01 16:22:04 -06:00
callum 6a5d194526 STORM-986 FIX (build error/Linux) media_plugin_webkit errors on some Windows systems 2011-02-10 11:51:53 -08:00
callum 7e6ce12a17 VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the current working
Reviewed by Richard - http://codereview.lindenlab.com/6011001/
2011-02-08 15:37:12 -08:00
Oz Linden b4b3f78c45 pull back fixes from beta 2011-01-28 17:05:11 -05:00
callum 38dceba9b4 STORM-927 - FIX - [VWR-24426] SSL Handshake Failed Error when accessing web-based content on development viewers using recent Webkit 4.7
Also removed refs to debug vars used to specify location of pem file
2011-01-28 11:17:18 -08:00
Aleric Inglewood ee6a40beb1 VWR-24519: make debugging easier by not spawning spare process 2011-01-21 16:02:38 -05: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
Monroe Linden d275251138 SOCIAL-399 FIX Viewer crash when canceling http auth on a media prim
Reviewed by Callum at http://codereview.lindenlab.com/5636001
2010-12-20 16:33:25 -08:00
callum 67ca1c0b62 SOCIAL-395 (FIX) LLWebContentFloater not handling Javascript size and window position parameters in
Change to llfloaterwebcontent.cpp is a whitespace change only to fix a broken checkin
2010-12-17 16:20:19 -08:00
callum 0af2c1a482 SOCIAL-371 (PARTIAL) HTTP Auth sites do not load / allow login on Media on a Prim faces in Webkit 4.7
Fixes broken text substituition of realm/host only.
2010-12-17 15:54:20 -08:00
Richard Linden 8044661bd5 WIP XUI HTTP Auth dialog
refactored LLWindowShade into seperate file
improved layout of dialog
improved dialog resizing logic
Tab and Enter keys now work as expected in windowshade form
added "modal" capability to window shade
added HTTP Auth notifications to MOAP
2010-12-10 10:11:03 -08:00
Monroe Linden 598450785b merge 2010-12-02 14:51:16 -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
Richard Linden a927b1cb0e SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1
initial support for XUI auth dialog
2010-11-18 22:34:54 -08:00
Mark Palange (Mani) 6802775bc4 Merge with viewer-development 2010-11-18 15:36:11 -08:00
Monroe Linden 9d82af29df SOCIAL-233 WIP Better performance (improve loading time of webkit instance)
The plugin system will now keep a spare running webkit plugin process around and use it when it needs a webkit instance.  This should hide some large portion of the setup time when creating a new webkit plugin (i.e. opening the search window, etc.)
2010-11-17 16:01:46 -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 b4efcccce7 Merge with tip of of viewer-development (http://hg.secondlife.com/viewer-development) 2010-11-15 17:21:27 -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
Mark Palange (Mani) 6ab2e44e94 VWR-23666 Removed setting VersionChannelName. LLVersionInfo::resetChannel() and unit tests. Reviewed by brad. 2010-11-01 15:18:18 -07:00
Oz Linden 4fa6500b51 STORM-480 remove unused "wrap" parameter from LLDir::getNetFileInDir
--HG--
branch : storm-102
2010-10-28 18:09:09 -04:00
Monroe Linden d6f1f79ced Merge of popup-geometry code. 2010-09-16 13:29:35 -07:00
Richard Linden 387011a1ff EXP-29 WIP Implement popup blocking
added web popup notification overlay
2010-09-16 00:45:27 -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
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 74d4bbfa0a Added the MediaEnablePopups setting as a global on/off switch for media popups. 2010-08-26 12:26:31 -07:00
Monroe Linden 011c3686a6 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-08-09 17:05:53 -07:00
Tofu Linden 22f65ad046 merge from viewer-release 2010-08-07 12:43:55 +01:00
Monroe Linden bcd8443371 Fixes for EXT-8563 "VWR-20156: Prim Media on HUDs has no Audio or Interactivity"
Backed out changeset 1b65d0d42c67 (the fix for EXT-5205), and replaced it with a check in LLPanelPrimMediaControls::nextZoomLevel().

Made LLViewerMediaImpl::calculateInterest() not attempt to calculate distances to HUD attachments, since their global positions are invalid.
2010-08-06 20:06:16 -07:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Monroe Linden d4668787ad Allow targeted links in the embedded browser to open multiple media browser windows.
Added an optional "target" parameter" to LLWeb::loadURL and loadInternal.

Made LLViewerMediaImpl::handleMediaEvent pass the target attribute of clicked links through.

Set floater_media_browser.xml to allow multiple instances.

Added LLFloaterMediaBrowser::create() and made LLFloaterMediaBrowser assume the incoming tag is the window's target, not the URL.

Reviewed by Richard at http://codereview.lindenlab.com/2641050
2010-08-05 11:16:13 -07:00
Richard Nelson bd20eddd4e EXT-8540 - Implement mime type override for web_browser ctrl
reviewed by Monroe
2010-08-02 14:52:09 -07:00
Monroe Linden 6833a97c94 Fix for EXT-8533
When sending the MIME type probe, tell LLCurl to allow cookies in the response.  This works around an issue with some sites that will get into an infinite redirect loop when cookies are disabled.
2010-07-30 17:13:27 -07:00
Monroe Linden 84a9e0abd8 Fix for EXT-8339
Added a couple of new nav states to LLViewerMediaImpl: MEDIANAVSTATE_FIRST_LOCATION_CHANGED_SPURIOUS and MEDIANAVSTATE_COMPLETE_BEFORE_LOCATION_CHANGED_SPURIOUS.  These behave just like the corresponding states without the _SPURIOUS suffix, but will be used if the new navigate doesn't change the current URL of the impl.  This allows us to catch cases like the repro of this issue and discard the spurious navigate events.
2010-07-30 13:51:37 -07:00
Aimee Linden 81f5c02414 EXT-7498 WIP Snapshot Sharing
Reviewed by Tofu.
2010-06-28 16:30:08 +01:00
Kent Quirk 3ae35441b9 EXT-8039 - further fix to allow mac/linux to build properly 2010-06-25 13:00:34 -04:00
Monroe Linden d6af2d0985 Fix for EXT-7414 (Jumping to a specific time in a video stream does not work in Viewer 2.)
This was a race condition.  In the repro case, LLViewerMediaImpl::seek() was getting called before the media source got a chance to be loaded (since the load is now delayed at least 1 frame due to the priority calculations), so the seek command was being dropped.

The fix is to save the seek time in mPreviousMediaTime in this case, and rearrange the code in LLViewerMediaImpl::loadURI() so that it gets used whenever it's non-zero.  I've also added similar code in LLViewerMediaImpl::pause() and LLViewerMediaImpl::start() to set mPreviousMediaState.  (If there are any cases where content wants parcel media to start out paused, they would have had a similar issue.)

Reviewed by Callum and Richard at http://codereview.lindenlab.com/2478002 .
2010-06-15 10:53:02 -07:00
Richard Linden 68ca9dc957 VI-49 FIX "_external" links should work in shared media
monroe already did most of this, just moved dialog for confirming opening external browser to common code that calls out to external browser
so no way to skip notification unless the user opts out
2010-05-27 18:26:06 -07:00
Richard Linden 1040c7039b merge 2010-05-25 10:15:09 -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
Richard Linden e98a52a211 tweaked media attenuation to better match object sound attenuation 2010-05-20 14:00:56 -07:00