summaryrefslogtreecommitdiff
path: root/indra/media_plugins
AgeCommit message (Collapse)Author
2022-04-13Rework cmake, the original plan was to maybe be able to use conan targets ↵Nicky
with the same name (that's why 3ps had names like apr::apr), but it's safer and saner to put the LL 3ps under the ll:: prefix. This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-13Remove another old remnant of the debug config.Nicky
2022-04-06Move CMake files to modernized cmake syntax, step 1.Nicky
Change projects to cmake targetsto get rid of havig to hardcore include directories and link libraries in consumer projects.
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-11-09SL-16333 VLC 3 doesn't support -1 == infinity for input-repeatAndrey Lihatskiy
by Callum
2021-10-28SL-16247 Post-d520 libvlc plugin fixesAndrey Lihatskiy
by Callum
2021-10-22Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
2021-10-22Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
2021-10-18SL-16047 Strip unused includesAndrey Kleshchev
2021-10-13Merge with head of Master after a new Viewer releaseCallum Prentice
2021-10-07Fix: SL-12320 The Viewer functionality is broken with an in-viewer enabled proxyCallum Linden
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
# Conflicts: # autobuild.xml # build.sh # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-10Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-07-19Merge with Master after Viewer Release (also fixed some glaring automerge ↵Callum Prentice
screw ups)
2021-07-12Fix for SL-15560 pages with undefined html render with gray background ↵Callum Prentice
instead of white in CEF v91
2021-07-12Fix for SL-15559 PDF files do not load in CEF v91Callum Prentice
2021-05-18Pull in updated Dullahan and use it for for: Fix SL-14888 Media on a Prim ↵Callum Prentice
should not show JS (about to unload) popups
2021-05-14Fixes SL-14897 Disable Flash support in the embedded browserCallum Prentice
2021-05-13Revert "Merge branch 'DRTVWR-531' into DRTVWR-516-maint"Andrey Lihatskiy
This reverts commit 07456abe92ab24f373b238f6bd64087c078b7fc3, reversing changes made to 8a33636e8f56f8d1229b3f76ed6205ce8087048d.
2021-04-27SL-14664 Added zoomout and sizeallAndrey Kleshchev
Remade code to use getCursorFromString
2021-04-27SL-14664 Added 'alias'Andrey Kleshchev
2021-04-26SL-14664 Increase range of supported cursors on prim's mediaAndrey Kleshchev
2021-02-24Pull in new version of Dullahan with support for setting the host process ↵Callum Prentice
path, tweak viewer manifest so it copies the SwiftShader folder (required but may be a Chromium bug) and improve background color matching
2020-11-11Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2020-10-01SL-14044 Windows build fixAndrey Lihatskiy
2020-08-10SL-3704 Give plugins some time to terminateAndrey Kleshchev
requestExit() doesn't close CEF, command sets CEF into closing state which will be processed on update()
2020-07-21Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
2020-07-17SL-13567 Users should have separate CEF contextsAndrey Kleshchev
2020-06-23DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476Nat Goodspeed
following release of D512.
2020-04-28Initial port of the changes from DRTVWR509 (Adult Swim) minus the volume ↵Callum Prentice
fall-off settings updates
2020-03-25DRTVWR-494: Fix Windows macro collisions in windows_volume_catcherNat Goodspeed
by tweaking #include order.
2019-10-16Merge fixandreykproductengine
2019-10-15Backed out changeset: eb99f42d0fdcAndreyL ProductEngine
2019-10-15Downstream merge from lindenlab/viewer-bearAndreyL ProductEngine
2019-09-14Backed out changeset: 8e228364f324AndreyL ProductEngine
2019-09-14Backed out changeset: b4182ee25942AndreyL ProductEngine
2019-09-14Backed out changeset: a6398f90389aAndreyL ProductEngine
2019-08-13Merged in lindenlab/viewer-bearAndreyL ProductEngine
2019-08-13Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2019-08-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-07-25SL-10962 Support for suppressing JavaScript dialogs in the media plugin codeAndreyL ProductEngine
2019-07-01SL-3704 Plugin exit issuesandreykproductengine
2019-06-20Merged in DRTVWR-492AndreyL ProductEngine
2019-06-11Pull in CEF 75.0.1+gb5e74dd+chromium-75.0.3770.80 and Dullahan 1.2.x along ↵callum_linden
with some minor compatibility changes
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 15:35:37 +0000