defdbaf40d
Fixup for Linux media plugins.
...
- Remove VLC
- Remove missing cmake includes (that got deleted in earlier changes) from gstreamer plugin.
2022-04-18 03:12:19 +02:00
e0cf0cdfd4
Switch to target_include_directories
...
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-17 18:04:57 +02:00
2c3507a9d2
Cleanup plugin, create proper target for link libraries. Remove unused
...
variables.
2022-04-16 19:58:17 +02:00
241919e7f7
Rework cmake, the original plan was to maybe be able to use conan targets 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-13 19:21:55 +02:00
2c9ede0ccc
Remove another old remnant of the debug config.
2022-04-13 10:29:10 +02:00
786b291d9c
Move CMake files to modernized cmake syntax, step 1.
...
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# 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-03-02 10:12:19 +01:00
63238d1fbe
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/newview/llappviewer.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/viewer_manifest.py
2022-03-01 19:19:48 +01:00
a74de2d794
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 19:14:31 +01:00
617c01e26b
Linux; remove setting of proxy info till dullahan gets an update.
2022-03-01 13:20:43 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# 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-03-01 13:41:42 +02:00
c5e258f40f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 08:38:19 +01:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
0aa59b2bee
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-22 13:40:40 +01:00
7dd7abf396
Bring back gstreamer, remove the old and unmaintained Linux VLC version.
2022-02-20 21:24:37 +01:00
25922d422a
SL-16827 Play doesn't start audio if audio reached end
2022-02-09 22:20:12 +02:00
78830a3a40
SL-16827 Time slider not working for some music
2022-02-09 22:10:32 +02:00
0e90e53231
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-02-09 10:31:16 +01:00
b9e0f5fd3b
SL-13470 Media on a prim loops when it should not
2022-02-09 01:27:21 +02:00
472f4c0c73
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 12:24:32 +01:00
abe4857fd3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 10:13:39 +01:00
f669e46308
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 09:39:17 +01:00
49920893c9
Rework linux_volume_catcher to not just look for current pid but also to walk up the parent chains to look for a matching pid.
...
With CEF there will be a process created for render, gpu and so on, meaning SLPlugin (the process with the volume catcher) will not be the process playing audio, it will rather be a child process of slplugin.
2022-02-01 21:48:02 +01:00
65f30d196c
Move pulse header detection.
2022-02-01 17:44:51 +01:00
e52fc55391
Detect Pulseaudio (only headers are needed), if found compile linux_colume_catcher.cpp for CEF volume control.
2022-01-31 11:35:16 +01:00
f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
95db09d8d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:31:49 +01:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
d91606b354
Merge branch 'master' into DRTVWR-544-maint
2021-12-20 15:36:23 +02:00
496156073b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-16 18:56:31 +01:00
39f272278c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp
2021-12-16 10:20:56 +01:00
6663bc6f85
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llviewercontrol.cpp
2021-12-16 09:49:35 +01:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
341db56df1
SL-16510 fix vlc not restoring position after a resize
2021-12-14 21:40:14 +02:00
e55a0510ff
SL-16510 VLC time slider sometimes does not work
2021-12-14 21:40:10 +02:00
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
969762f162
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 16:29:50 +01:00
f00647b6fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 15:38:25 +01:00
ced9423261
Merge branch 'DRTVWR-534' of https://bitbucket.org/lindenlab/viewer
2021-11-16 12:17:26 +01:00
0505c6ebbb
Merge branch 'master' into DRTVWR-534
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2021-11-16 01:21:55 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
f9373a9b4e
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
2021-11-16 00:54:53 +02:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
b14d460dca
Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer
2021-11-10 21:21:51 +01:00
8dd9554eb5
SL-16333 VLC 3 doesn't support -1 == infinity for input-repeat
...
by Callum
2021-11-09 02:38:58 +02:00
8acce67f95
SL-16247 Post-d520 libvlc plugin fixes
...
by Callum
2021-10-28 00:52:03 +03:00
3f16aed5ae
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-23 00:24:22 +02:00
7b279b160a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-22 23:19:21 +02:00
07aa342bc4
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# autobuild.xml
2021-10-22 15:27:15 +03:00
f1a7e400a2
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# autobuild.xml
2021-10-22 15:03:00 +03:00
a701165522
SL-16047 Strip unused includes
2021-10-18 17:36:14 +03:00
851767b808
SL-16131 Fix for alignment warnings on Win32 builds.
2021-10-14 17:41:38 +00:00
8a1bc1b9e2
Merge with head of Master after a new Viewer release
2021-10-13 14:47:06 -07:00
bff236d893
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 14:27:41 +02:00
8af72281f5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 13:34:50 +02:00
110a4a0dff
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 12:48:39 +02:00
0c23720e73
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
2021-10-12 12:47:04 +02:00
454c7f4543
Fix: SL-12320 The Viewer functionality is broken with an in-viewer enabled proxy
2021-10-07 20:16:54 +03:00
abd5f7a899
Linux; Update dullahan once more.
2021-09-28 23:58:53 +02:00
1bc442ac0b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-09-20 12:29:47 +02:00
cd4f90e2c0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-09-20 11:18:53 +02:00
cef73bce8f
Linux; Disable GPU once more, as once again having it on caues isues on some systems.
2021-09-16 13:35:44 +02:00
035befac70
Linux; Update CEF.
2021-09-12 01:24:08 +02:00
33c20ba190
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# 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-24 14:49:13 +02:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
82a9b2ef62
Remove traces of old custom Dullahan lib
2021-08-23 19:02:59 +02:00
0c89e67eb5
DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one.
2021-08-20 08:28:48 -07:00
97f09de4fc
Merge branch 'master' into DRTVWR-520-apple-notarization
...
# 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-12 23:13:12 +03:00
1dfdcb8566
Linux; do not call setOnJSBeforeUnloadCallback till we get a new dullahan for Linux.
2021-08-10 15:40:23 +02:00
9ac1a63a41
Merge branch 'master' into DRTVWR-530-maint
2021-08-10 06:43:59 +03:00
ff816141e3
Comment out setting CEF volume until there is an updated custom CEF lib
2021-08-09 14:30:44 +02:00
ca4e15c930
Merge branch 'DRTVWR-531' of https://bitbucket.org/lindenlab/viewer
2021-08-09 14:27:13 +02:00
a242edc99d
Merge with Master after Viewer Release (also fixed some glaring automerge screw ups)
2021-07-19 17:43:19 -07:00
95b26d3bec
Fix for SL-15560 pages with undefined html render with gray background instead of white in CEF v91
2021-07-12 14:17:04 -07:00
3602d64a09
Fix for SL-15559 PDF files do not load in CEF v91
2021-07-12 12:50:34 -07:00
c308c1cf59
Pull in updated Dullahan and use it for for: Fix SL-14888 Media on a Prim should not show JS (about to unload) popups
2021-05-18 08:45:57 -07:00
c705126d0b
Fixes SL-14897 Disable Flash support in the embedded browser
2021-05-14 15:21:06 -07:00
9826ae6967
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-05-13 23:26:52 +02:00
a442f8b451
Revert "Merge branch 'DRTVWR-531' into DRTVWR-516-maint"
...
This reverts commit 07456abe928a33636e8f
2021-05-13 20:29:01 +03:00
a703746196
Revert screwing up the browser background once again...
2021-05-11 21:12:04 +02:00
fbeaed7c76
Comment this out until the get our own Dullahan updated
2021-05-11 21:10:26 +02:00
cd3b20552c
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-05-11 21:09:19 +02:00
5cde118ec8
SL-14664 Added zoomout and sizeall
...
Remade code to use getCursorFromString
2021-04-27 23:08:54 +03:00
e5136cd19b
SL-14664 Added 'alias'
2021-04-27 20:51:23 +03:00
8b3f4b56f9
SL-14664 Increase range of supported cursors on prim's media
2021-04-26 23:55:45 +03:00
7e8aed44a6
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-03-17 18:47:16 +01:00
493200bca5
Undo Linux updates.
2021-03-09 10:40:01 +01:00
1a9a94c291
Remove VLC
2021-02-28 07:28:29 +01:00
2aea7cfc25
Pull in new version of Dullahan with support for setting the host process path, tweak viewer manifest so it copies the SwiftShader folder (required but may be a Chromium bug) and improve background color matching
2021-02-24 15:20:39 -08:00
24b2f60d1a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates
2021-02-06 00:18:07 +01:00
b9bcfad195
Merge branch 'master' into DRTVWR-520-apple-notarization
2020-11-11 22:45:54 +02:00
af61974386
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-05 09:14:11 +01:00
78671526d7
Merge remote-tracking branch 'fs/master' into linux-updates
2020-10-26 21:52:11 +01:00
0167018542
Stop building the media example plugin (and including it in a release)
2020-10-24 15:46:52 +02:00
1811cdc447
SL-14044 Windows build fix
2020-10-01 08:44:30 +03:00
000f3be01a
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-18 23:53:40 +02:00
d699769601
Add glib package and use this instead of the old glib+gtk+atk+...
2020-08-17 21:43:43 +02:00
Nicky