cf85e854e5
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-09-15 21:14:13 +02:00
3248eb87dc
SL-18151 [SEC] MOAP can force multiple floaters open on users screen: The 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-09-14 14:52:31 -07:00
6d09c9ff89
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 12:37:05 +02:00
d0848a2ac0
Linux: cef needs a dependency on llwindow to properly propagate the SDL defines.
2022-08-04 12:19:47 +02:00
3866fcfdc3
Streamline SDL1/SDL2 propgation and handle it in one place rather than having it multiple times
...
in the cmake files.
2022-08-04 00:46:42 +02:00
2ab6dd9344
Linux SDL2 - make keyboard input work for the CEF plugin, still a couple funky keys left to deal with later
2022-08-03 13:56:01 +02:00
dad5b8e78e
Example code for SDL2/CEF.
2022-08-03 10:43:05 +02:00
9300613edc
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-06-29 21:57:31 +02:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
a7e4428d06
SL-17452 CEF not working in non-ASCII install path
...
Fix ASCII specific function
2022-05-21 00:04:17 +03: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
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
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
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
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
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
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
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
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
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
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
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
Ansariel