summaryrefslogtreecommitdiff
path: root/indra/media_plugins
AgeCommit message (Collapse)Author
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
2010-04-28Fixed default pan value in mac volume catcher, and corrected the filename in ↵Monroe Linden
the header comment.
2010-04-29fixed potential buffer overrun in volume codeRichard Linden
2010-04-27added some documentation to winmm_shimRichard Linden
2010-04-27fixed eol and tabs/spaces problemsRichard Nelson
2010-04-27EXT-6921 - Windows Xp/Vista unified volume controlRichard Nelson
2010-04-19EXT-6921 - Media Volume Changes changes system volume on WinXPRichard Nelson
reviewed by Callum
2010-04-16removed tabs from cmakelist.txtRichard Linden
2010-04-16windows_volume_catcher.cpp, now with comments!Richard Linden
also added volume_catcher.h to project
2010-04-15EXT-6888 - Implement per-media instance volume controlRichard Linden
2010-04-13Minor cleanup in mac_volume_catcher.cpp.Monroe Linden
2010-04-13Initial implementation of mac_volume_catcher.cpp.Monroe Linden
2010-04-09Set up volume control code in webkit plugin for platform-specific ↵Monroe Linden
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-03-29Fix for EXT-6615 (SL webkit no longer reports "Second Life" in the ↵Monroe Linden
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-26Implemented central storage mechanism for media plugin cookies.Monroe Linden
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-23Merge from viewer-2-0Tofu Linden
2010-03-18EXT-6466 "Move "Enable Cookies" checkbox...", EXT-6402 "Add feature to ↵Callum Prentice
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-16Fix for build error in media_plugin_example.cpp.Monroe Linden
2010-03-16Added an "init" message in LLPLUGIN_MESSAGE_CLASS_MEDIA, and made ↵Monroe Linden
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-15merge from viewer-2-0Tofu Linden
2010-03-12New linux build of llqtwebkit.Monroe Linden
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-11merge.Tofu Linden
2010-03-04EXT-5969 build and merge a shippable pixmap-based llqtwebkit for ↵Tofu Linden
viewer2.0/linux Maybe also: EXT-4495 flash content crashes Webkit on Linux