aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/media_plugins (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'jacek/exp' into expDavid Seikel2011-04-031-0/+10
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/llpanellogin.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/install.xml Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
| * Added log info for when GStreamer fails to load because the plugin wasn't ↵McCabe Maxsted2011-03-191-0/+10
| | | | | | | | compiled correctly
* | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-201-55/+55
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * Merge remote-tracking branch 'jacek/weekly' into weeklyMcCabe Maxsted2011-03-091-2/+2
| |\ | | | | | | | | | | | | Conflicts: linden/indra/newview/viewer_manifest.py
| | * Fixed Linux compile warnings in media_plugin_gstreamer010.cpp.Jacek Antonelli2011-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | Warning was because writeToLog expected a char pointer, but was being given string constants. Exact warning message was: deprecated conversion from string constant to ‘char*’
| * | fix gstreamer plugin doesn't compile on linuxArmin Weatherwax2011-03-011-53/+53
| |/
* | Merge branch 'weekly' into brandingDavid Seikel2011-02-206-80/+119
|\ \ | |/ | | | | | | | | | | Conflicts (solved): linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llappviewerwin32.cpp
| * Removed a bit of spam from the GStreamer log fileMcCabe Maxsted2011-02-181-0/+1
| |
| * Merge remote branch 'remotes/github/weekly' into weeklyMcCabe Maxsted2011-02-182-9/+7
| |\
| | * Fixed Windows compile error introduced in fe9a3d2b. Also made sure ↵McCabe Maxsted2010-11-231-0/+2
| | | | | | | | | | | | winsock2.h is always included before windows.h throughout the source to prevent collisions
| | * Merge remote branch 'aleric/weekly' into weeklyMcCabe Maxsted2010-11-231-9/+5
| | |\
| | | * IMP-590: Added a thread-safe and robust wrapper for APR pools.Aleric Inglewood2010-11-171-9/+5
| | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/590
| * | | Created a media_plugin_gstreamer010.log file in the cwd for the GStreamer pluginMcCabe Maxsted2011-02-181-68/+96
| | | |
| * | | Fixed gstreamer plugin headers missing from cmakeMcCabe Maxsted2011-02-101-0/+6
| | | |
| * | | Make media_plugin_gstreamer010 find all its headers correctly on Windows ↵McCabe Maxsted2011-02-101-1/+1
| | | | | | | | | | | | | | | | (notes: need to add archives for iconv and gstreamer to install.xml, doesn't link yet)
| * | | Enabled gstreamer10 media plugin in CMake for WindowsMcCabe Maxsted2011-02-101-2/+8
| |/ /
* | | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵David Seikel2011-02-091-2/+2
|/ / | | | | | | | | | | need to be reverted later. Changed file names to.
* | Use Quicktime plugin on Mac, not GStreamer.Jacek Antonelli2010-11-131-4/+4
| |
* | GStreamer010 plugin needs Carbon.h on Mac.Jacek Antonelli2010-11-131-0/+4
|/
* IMP-692: SNOW-713: Merge branch 'weekly' into SNOW-713Aleric Inglewood2010-11-092-24/+23
|\ | | | | | | | | | | | | Conflicts: linden/indra/newview/viewer_manifest.py Trivial proximity collision. Resolved.
| * Ported media_plugin_webkit changes from Snowglobe2, which are identical to ↵McCabe Maxsted2010-11-071-2/+8
| | | | | | | | SL2.3. This includes a more stable version of llqtwebkit for Windows
| * Use the LGPL version of the quicktime media plugin. This allows us to use ↵McCabe Maxsted2010-11-071-22/+15
| | | | | | | | quicktime without violating the GPL
* | IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-076-50/+10
|/ | | | | | | | | | See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
* Fix llqtwebkit version incompatibility.Aleric Inglewood2010-11-021-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch has the minimum changes needed to be compatible with LLQTWEBKIT_API_VERSION 2. From llqtwebkit.h: Version 2: indra/media_plugins/webkit/media_plugin_webkit.cpp: * Changed the usage of the event parameters in onClickLinkHref and onClickLinkNoFollow events slightly. The clicked URI for both should now be retrieved with getEventUri() instead of getStringValue(). The "target" string in onClickLinkHref is now retrieved with getStringValue() instead of getStringValue2(). * The contents of getStringValue2() in the onClickLinkHref event is now a unique ID for the window proxy the click targets. all changed files: * Removed the "link target type" concept, since it doesn't really belong here. Note that not all changes have been taken into account, since we need a LOT of code changes for MoaP before that gets relevant; most notably: "target" and "uuid" aren't used anywhere. The new LLEmbeddedBrowserWindowObserver::onWindowGeometryChangeRequested and LLEmbeddedBrowserWindowObserver::onRequestFilePicker are still not implemented. Version 1 introduced LLEmbeddedBrowserWindowObserver::onWindowCloseRequested which is also still not implemented.
* Delete piece of code that is redundant.Aleric Inglewood2010-11-021-8/+0
|
* Only initialize WebCore resource(s) on linux.Aleric Inglewood2010-10-281-7/+8
| | | | | | | I searched the darwin and windows llqtwebkit tarballs and neither qInitResources_WebCore nor qInitResources_WebCore_QT_NAMESPACE exist in there... No idea why, but then we can't call it to initialize it now can we?
* Load prebuilt glib when needed. Don't compile gstreamer plugin on windows.Aleric Inglewood2010-10-271-3/+5
| | | | | Also, darwin doesn't use quicktime, so disabled compiling that plugin for darwin.
* Merge remote branch 'origin/webkit_plugins' into webkit_pluginsMcCabe Maxsted2010-10-271-1/+13
|\
| * Remove the need for qglobal.h on non-standalone.Aleric Inglewood2010-10-271-1/+13
| |
* | Set LL_GSTREAMER010_ENABLED to true for Linux-only until gstreamer loading ↵McCabe Maxsted2010-10-262-4/+4
|/ | | | can be sorted on windows
* Fix the errors "QCursor: Cannot create bitmap cursor; invalid bitmap(s)" at ↵Aleric Inglewood2010-10-221-0/+4
| | | | | | | start up of the webkit plugin. These are caused because builtin resources of QtWebKit weren't initialized.
* Comment out code to make it compile at all (with the latest llqtwebkit).Aleric Inglewood2010-10-151-0/+7
|
* Let the gstreamer plugin build on windowsRobin Cornelius2010-10-102-4/+22
|
* linux* kill imprudence gstreamer, use system gstreamer instead.Armin Weatherwax2010-09-231-1219/+0
| | | | | who ever builds a release with that needs to consider to install some really old gstreamer at /usr/local/lib - lenny has 0.10.19
* Imprudence style gstreamer plugin (remove llgst, syms and such)Armin Weatherwax2010-09-238-528/+410
|
* Fixed plugin compile issues on windowsMcCabe Maxsted2010-09-232-1/+2
|
* update to viewer-external SLPlugin + webkit. Fixes (lots of) webpages not ↵Armin Weatherwax2010-09-239-66/+635
| | | | | | loading. Issue: llqtwebkit needs update for Linux 64bit
* Robin Cornelius: fixes for building plugins on Linux 64bitArmin Weatherwax2010-09-234-0/+16
|
* update llplugin to latest version of SG2, pull latest webkitArmin Weatherwax2010-09-231-0/+1
|
* update to latest SG2 media_pluginsArmin Weatherwax2010-09-2320-229/+956
|
* port SG2.0 Mediaplugs (webkit supports flash now)Armin Weatherwax2010-09-2321-142/+226
|
* Added fix for word size from Snowglobe (only for Windows--didn't update ↵McCabe Maxsted2010-09-235-8/+40
| | | | Linux or Mac as I can't test them)
* First LL update of plugins, mainly documentationArmin Weatherwax2010-09-239-101/+353
|
* llmediaplugins first stepArmin Weatherwax2010-09-2322-0/+6512
generated by cgit v1.1 at 2024-11-15 13:36:56 +0000