summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
AgeCommit message (Collapse)Author
2011-03-16Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-03-04Merge with headcallum
2011-03-04SOCIAL-510 FIX (#3) SL Profile Pages Seem to be Ignoring Assetscallum
(New CA.pem with Equifax cert in it) See also SOCIAL-569 [VWR-24426] SSL Handshake Failed Error when accessing web-based content on development viewers using recent Webkit 4.7
2011-03-04MergeLeyla Farazha
2011-03-04SOCIAL-643 As a user, I would like to be able to browse and purchase from ↵Leyla Farazha
the marketplace from within the viewer by logging in only once, and with no appreciable delay
2011-03-04SOCIAL-510 FIX (#2) SL Profile Pages Seem to be Ignoring Assetscallum
(New version of LLQtWebKit and now load CA.pem) See also SOCIAL-569 [VWR-24426] SSL Handshake Failed Error when accessing web-based content on development viewers using recent Webkit 4.7
2011-03-03SOCIAL-510 FIX SL Profile Pages Seem to be Ignoring Assetscallum
(New version of LLQtWebKit and now load CA.pem) See also SOCIAL-569 [VWR-24426] SSL Handshake Failed Error when accessing web-based content on development viewers using recent Webkit 4.7
2011-02-11Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-10STORM-986 FIX (build error/Linux) media_plugin_webkit errors on some Windows ↵callum
systems
2011-02-10Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-08VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the ↵callum
current working Reviewed by Richard - http://codereview.lindenlab.com/6011001/
2011-02-01Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-01-28pull back fixes from betaOz Linden
2011-01-28STORM-927 - FIX - [VWR-24426] SSL Handshake Failed Error when accessing ↵callum
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-24Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-01-21VWR-24519: make debugging easier by not spawning spare processAleric Inglewood
2010-12-29Automated merge up from viewer-developmentLoren Shih
2010-12-21SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7Monroe Linden
Reviewed by Callum
2010-12-20SOCIAL-399 FIX Viewer crash when canceling http auth on a media primMonroe Linden
Reviewed by Callum at http://codereview.lindenlab.com/5636001
2010-12-17SOCIAL-395 (FIX) LLWebContentFloater not handling Javascript size and window ↵callum
position parameters in Change to llfloaterwebcontent.cpp is a whitespace change only to fix a broken checkin
2010-12-17SOCIAL-371 (PARTIAL) HTTP Auth sites do not load / allow login on Media on a ↵callum
Prim faces in Webkit 4.7 Fixes broken text substituition of realm/host only.
2010-12-10WIP XUI HTTP Auth dialogRichard Linden
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-02mergeMonroe Linden
2010-12-01Automated merge up from viewer-developmentLoren Shih
2010-11-30SOCIAL-299 FIX Add *.lindenlab.com to trusted certificate authorities in WebKitcallum
Reviewed by CB
2010-11-18SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1Richard Linden
initial support for XUI auth dialog
2010-11-18Merge with viewer-developmentMark Palange (Mani)
2010-11-17SOCIAL-233 WIP Better performance (improve loading time of webkit instance)Monroe Linden
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-16SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1Monroe Linden
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-15Merge with tip of of viewer-development ↵callum
(http://hg.secondlife.com/viewer-development)
2010-11-05EXP-378 FIX Disable SSL cert errors in LLQtWebkit for testing purposescallum
(Monroe's code - I made a patch and copied it over from viewer-skylight branch)
2010-11-01VWR-23666 Removed setting VersionChannelName. LLVersionInfo::resetChannel() ↵Mark Palange (Mani)
and unit tests. Reviewed by brad.
2010-10-28STORM-480 remove unused "wrap" parameter from LLDir::getNetFileInDirOz Linden
--HG-- branch : storm-102
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-08-31mergeDave Parks
2010-09-16Merge of popup-geometry code.Monroe Linden
2010-09-16EXP-29 WIP Implement popup blockingRichard Linden
added web popup notification overlay
2010-09-15Enable web popups to specify size and position of the Media Browser window ↵Monroe Linden
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-10Added support for a media plugin message that asks the viewer to open a file ↵Monroe Linden
picker on the plugin's behalf. Reviewed by Callum.
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-26Added the MediaEnablePopups setting as a global on/off switch for media popups.Monroe Linden
2010-08-25mergeDave Parks
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-19Integrate SIMD API from oreh/server-trunk-orehDave Parks
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-09Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicMonroe Linden
2010-08-07merge from viewer-releaseTofu Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 04:34:31 +0000