Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added log info for when GStreamer fails to load because the plugin wasn't ↵ | McCabe Maxsted | 2011-03-19 | 1 | -0/+10 |
| | | | | compiled correctly | ||||
* | Merge remote-tracking branch 'jacek/weekly' into weekly | McCabe Maxsted | 2011-03-09 | 1 | -2/+2 |
|\ | | | | | | | | | Conflicts: linden/indra/newview/viewer_manifest.py | ||||
| * | Fixed Linux compile warnings in media_plugin_gstreamer010.cpp. | Jacek Antonelli | 2011-03-04 | 1 | -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 linux | Armin Weatherwax | 2011-03-01 | 1 | -53/+53 |
|/ | |||||
* | Removed a bit of spam from the GStreamer log file | McCabe Maxsted | 2011-02-18 | 1 | -0/+1 |
| | |||||
* | Merge remote branch 'remotes/github/weekly' into weekly | McCabe Maxsted | 2011-02-18 | 2 | -9/+7 |
|\ | |||||
| * | Fixed Windows compile error introduced in fe9a3d2b. Also made sure ↵ | McCabe Maxsted | 2010-11-23 | 1 | -0/+2 |
| | | | | | | | | winsock2.h is always included before windows.h throughout the source to prevent collisions | ||||
| * | Merge remote branch 'aleric/weekly' into weekly | McCabe Maxsted | 2010-11-23 | 1 | -9/+5 |
| |\ | |||||
| | * | IMP-590: Added a thread-safe and robust wrapper for APR pools. | Aleric Inglewood | 2010-11-17 | 1 | -9/+5 |
| | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/590 | ||||
* | | | Created a media_plugin_gstreamer010.log file in the cwd for the GStreamer plugin | McCabe Maxsted | 2011-02-18 | 1 | -68/+96 |
| | | | |||||
* | | | Fixed gstreamer plugin headers missing from cmake | McCabe Maxsted | 2011-02-10 | 1 | -0/+6 |
| | | | |||||
* | | | Make media_plugin_gstreamer010 find all its headers correctly on Windows ↵ | McCabe Maxsted | 2011-02-10 | 1 | -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 Windows | McCabe Maxsted | 2011-02-10 | 1 | -2/+8 |
|/ / | |||||
* | | Use Quicktime plugin on Mac, not GStreamer. | Jacek Antonelli | 2010-11-13 | 1 | -4/+4 |
| | | |||||
* | | GStreamer010 plugin needs Carbon.h on Mac. | Jacek Antonelli | 2010-11-13 | 1 | -0/+4 |
|/ | |||||
* | IMP-692: SNOW-713: Merge branch 'weekly' into SNOW-713 | Aleric Inglewood | 2010-11-09 | 2 | -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 Maxsted | 2010-11-07 | 1 | -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 Maxsted | 2010-11-07 | 1 | -22/+15 |
| | | | | | | | | quicktime without violating the GPL | ||||
* | | IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins | Aleric Inglewood | 2010-11-07 | 6 | -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 Inglewood | 2010-11-02 | 1 | -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 Inglewood | 2010-11-02 | 1 | -8/+0 |
| | |||||
* | Only initialize WebCore resource(s) on linux. | Aleric Inglewood | 2010-10-28 | 1 | -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 Inglewood | 2010-10-27 | 1 | -3/+5 |
| | | | | | Also, darwin doesn't use quicktime, so disabled compiling that plugin for darwin. | ||||
* | Merge remote branch 'origin/webkit_plugins' into webkit_plugins | McCabe Maxsted | 2010-10-27 | 1 | -1/+13 |
|\ | |||||
| * | Remove the need for qglobal.h on non-standalone. | Aleric Inglewood | 2010-10-27 | 1 | -1/+13 |
| | | |||||
* | | Set LL_GSTREAMER010_ENABLED to true for Linux-only until gstreamer loading ↵ | McCabe Maxsted | 2010-10-26 | 2 | -4/+4 |
|/ | | | | can be sorted on windows | ||||
* | Fix the errors "QCursor: Cannot create bitmap cursor; invalid bitmap(s)" at ↵ | Aleric Inglewood | 2010-10-22 | 1 | -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 Inglewood | 2010-10-15 | 1 | -0/+7 |
| | |||||
* | Let the gstreamer plugin build on windows | Robin Cornelius | 2010-10-10 | 2 | -4/+22 |
| | |||||
* | linux* kill imprudence gstreamer, use system gstreamer instead. | Armin Weatherwax | 2010-09-23 | 1 | -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 Weatherwax | 2010-09-23 | 8 | -528/+410 |
| | |||||
* | Fixed plugin compile issues on windows | McCabe Maxsted | 2010-09-23 | 2 | -1/+2 |
| | |||||
* | update to viewer-external SLPlugin + webkit. Fixes (lots of) webpages not ↵ | Armin Weatherwax | 2010-09-23 | 9 | -66/+635 |
| | | | | | | loading. Issue: llqtwebkit needs update for Linux 64bit | ||||
* | Robin Cornelius: fixes for building plugins on Linux 64bit | Armin Weatherwax | 2010-09-23 | 4 | -0/+16 |
| | |||||
* | update llplugin to latest version of SG2, pull latest webkit | Armin Weatherwax | 2010-09-23 | 1 | -0/+1 |
| | |||||
* | update to latest SG2 media_plugins | Armin Weatherwax | 2010-09-23 | 20 | -229/+956 |
| | |||||
* | port SG2.0 Mediaplugs (webkit supports flash now) | Armin Weatherwax | 2010-09-23 | 21 | -142/+226 |
| | |||||
* | Added fix for word size from Snowglobe (only for Windows--didn't update ↵ | McCabe Maxsted | 2010-09-23 | 5 | -8/+40 |
| | | | | Linux or Mac as I can't test them) | ||||
* | First LL update of plugins, mainly documentation | Armin Weatherwax | 2010-09-23 | 9 | -101/+353 |
| | |||||
* | llmediaplugins first step | Armin Weatherwax | 2010-09-23 | 22 | -0/+6512 |