summaryrefslogtreecommitdiff
path: root/indra/media_plugins
AgeCommit message (Collapse)Author
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-09-14SL-18151 [SEC] MOAP can force multiple floaters open on users screen: The ↵Callum Linden
Viewer part of the fix for this JIRA - pulls in the updated Dullahan that exposes the user_gesture/is_redirect flags and uses them to determine what type of 'nav_type' is exchanged with viewer/plugin
2022-06-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-21SL-17452 CEF not working in non-ASCII install pathAndrey Kleshchev
Fix ASCII specific function
2022-05-01Remove setting of HEADER_FILE_ONLY on .h* files, cmake automaticallyNicky
sets the property on those.
2022-04-18Round one to support conan for 3P packages, this allows to build the viewer ↵Nicky
on Linux again.
2022-04-18Fixup for Linux media plugins.Nicky
- Remove VLC - Remove missing cmake includes (that got deleted in earlier changes) from gstreamer plugin.
2022-04-17Switch to target_include_directoriesNicky
All 3Ps include dirs are treated as SYSTEM, this will stop compilers stop emitting warnings from those files and greatly helps having high warning levels and not being swamped by warnings that come from external libraries.
2022-04-16Cleanup plugin, create proper target for link libraries. Remove unusedNicky
variables.
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-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-02-09SL-16827 Play doesn't start audio if audio reached endAndrey Kleshchev
2022-02-09SL-16827 Time slider not working for some musicAndrey Kleshchev
2022-02-09SL-13470 Media on a prim loops when it should notAndrey Kleshchev
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-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
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-12-14SL-16510 fix vlc not restoring position after a resizeAndrey Kleshchev
2021-12-14SL-16510 VLC time slider sometimes does not workAndrey Kleshchev
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
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-14SL-16131 Fix for alignment warnings on Win32 builds.Dave Parks
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 12:42:29 +0000