summaryrefslogtreecommitdiff
path: root/indra/media_plugins
AgeCommit message (Collapse)Author
2011-04-20merge changes for storm-1088Oz Linden
2011-04-17STORM-1088: corrected fix loading of winmm.dllSiana Gearz
2011-04-17STORM-1088: fix loading of winmm.dllSiana Gearz
2011-03-28Automated merge with file:///F:\code\viewer-autobuild2010Richard Linden
2011-03-25SOCIAL-688 FIX Multiple SLurls error given in minimal skin when clicking ↵callum
links in web profile Also fixes SOCIAL-521 and SOCIAL-428
2011-03-23Updated linux llqtwekit archive and fixed media webkit build and loading ↵alain@945battery-guestA-183.lindenlab.com
(fix CHOP-545).
2011-03-18MergeRichard Linden
2011-03-18merge out 2.6.0 changes from viewer-developmentOz Linden
2011-03-17SOCIAL-634 FIX Error condition content for Destination Guide, Avatar Picker,callum
and Help if S3 content or web content is not available. (Included refs to new LLQtWebKit that supports functionality)
2011-03-15eol fixesRichard Linden
2011-03-03SOCIAL-641 FIX C++ Runtime error in SLvoice.exe when launching Standard Skin ↵Richard Linden
on Windows
2011-01-13mac buiding with autobuild and autobuild style packages (just say no to ↵Andrew A. de Laix
install.py)
2010-12-23Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-exportOz Linden
2010-12-21SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7Monroe Linden
Reviewed by Callum
2010-12-15VWR-24252: On standalone, find Qt4 with find_package, and find llqtwebkit.Aleric Inglewood
If Qt and/or llqtwebkit is found in a non-standard place, you still have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running the viewer of course (or the webkit plugin will silently fail).
2010-12-03SOCIAL-318 FIX Example plugin doesn't render anythingcallum
2010-12-01SOCIAL-311 PARTIAL FIX (2) Media browser has too many oddities to be useful ↵callum
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-01OCIAL-231 FIX Enable tooltips (for links and images)Monroe Linden
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-11-30SOCIAL-299 FIX Add *.lindenlab.com to trusted certificate authorities in WebKitcallum
Reviewed by CB
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-09Trivial change to force a build in Team City.callum
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-10-08Merge fixes for VWR-23047, VWR-20911, and SNOW-748Oz Linden
2010-09-28merged SNOW-599/SNOW-747: Pulseaudio should be optional on Linux.Boroondas Gupte
2010-09-16Merged VWR-23047 (SNOW-512, -fPIC for 64bit) and follow-ups (VWR-20911 & ↵Boroondas Gupte
SNOW-748)
2010-08-31SNOW-748 FIXED Building on OSX 10.6 fails with "warning: -mdynamic-no-pic ↵Boroondas Gupte (original patches by Aimee Linden)
overrides - fpic or -fPIC" Originally commited at http://svn.secondlife.com/trac/linden/changeset/3499/projects/2010/snowglobe and http://svn.secondlife.com/trac/linden/changeset/3501 SVN changeset 3499 partially applied with --ignore-whitespace: Hunk #1 FAILED at 259. Hunk #2 FAILED at 265. 2 out of 2 hunks FAILED -- saving rejects to file indra/llcommon/CMakeLists.txt.rej patching file indra/media_plugins/webkit/CMakeLists.txt Hunk #1 succeeded at 33 with fuzz 1 (offset -8 lines). patching file indra/media_plugins/base/CMakeLists.txt patching file indra/media_plugins/gstreamer010/CMakeLists.txt patching file indra/media_plugins/example/CMakeLists.txt patching file indra/llplugin/CMakeLists.txt Manually applied to indra/llcommon/CMakeLists.txt (straight forward). SVN changeset 3501 applied with fuzz 1: patching file indra/media_plugins/webkit/CMakeLists.txt Hunk #1 succeeded at 33 with fuzz 1 (offset -8 lines). Hunk #2 succeeded at 39 with fuzz 1 (offset -8 lines). No further changes other than that.
2010-09-16SNOW-512/SNOW-287: Build of LLPlugin fails on 64bit linux due to non PIC ↵Boroondas Gupte (daggyfied changeset by Techwolf Lupindo, original fix by Robin Cornelius)
code linking into the DSO Formatting, cleanup, and one minor change by Techwolf Lupindo. Minor change was a move of the hunk in indra/media_plugins/webkit/CmakeLists.txt to same area as the other plugins CmakeLists.txt files. daggyfied version of https://bitbucket.org/Techwolf/viewer-development/changeset/00bd21962052
2010-09-25port of 'SNOW-592 FIXED gstreamer 0.10.28 standalone build failure'Tofu Linden
2010-09-25Update gstreamer video plugin's license in accordance with... our new license.Tofu Linden
2010-09-25VWR-23181 (port of SNOW-650) 'Tries to build pulseaudio when pulseaudio not ↵Tofu Linden
found.'
2010-09-23Backed out changeset acb451f83a9dTofu Linden
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-22Temporary changes to allow the viewer to build against an older version of ↵Monroe Linden
llqtwebkit. NOTE: once updated builds of llqtwebkit are available on all platforms, this changeset should be backed out.
2010-09-17Fix for EXP-78 (javascript window.open function with no size parameters ↵Monroe Linden
opens a tiny window when all popups setting is enabled).
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-13EXP-56 - viewer side of support for file picker dialog requirement.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-22SNOW-599/SNOW-747: Pulseaudio should be optional on Linux.Techwolf Lupindo
2010-08-17Viewer side changes to support javascript window.close handling.Monroe Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-06-22hairy merge of glib restorationTofu Linden
2010-06-22EXT-7889 PARTIAL Linux fails to load splash screen and side panel home tab.Tofu Linden
Start to restore manual glib handling. Backed out changeset ff86a9f5b917
2010-06-15Enable the call to LLQtWebKit::setWindowOpenBehavior() on Linux, since the ↵Monroe Linden
llqtwebkit build has been updated.
2010-06-15VWR-19683 llmediaimplgstreamervidplug gcc 4.4 build errorsTofu Linden
2010-06-13SNOW-541 PARTIAL GSTREAMER fail to load (slplugin?)Tofu Linden
Robustify the plugin a bunch more, and turn off a dodgy-and-unused visualization feature. (transplanted from 43273f751dac21d53dba83a90d7f9e057865f789)
2010-06-22EXT-7889 FIXED Linux fails to load splash screen and side panel home tab.Tofu Linden
2010-05-21Fix for EXT-5667 (support window.open() in shared media so google docs will ↵Monroe Linden
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-04-30mergeRichard Nelson
2010-04-28fix for media not working in release buildsRichard Nelson
reviewed by Mani
2010-04-28added optimization for media volume level of 1.0 (don't do anything)Richard Nelson