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
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
abd5f7a899
Linux; Update dullahan once more.
2021-09-28 23:58: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
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
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
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
000f3be01a
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-18 23:53:40 +02:00
8213cc896c
SL-3704 Give plugins some time to terminate
...
requestExit() doesn't close CEF, command sets CEF into closing state which will be processed on update()
2020-08-10 20:44:52 +03:00
e5677c891a
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-24 20:15:15 +02:00
168ae7434b
Update dullahan to get volume control back.
2020-07-20 14:08:49 +02:00
9a8171df90
Remmove volume control for now (needs updated dullahan)
2020-07-20 11:54:03 +02:00
9ee9dc841d
Switch to a dullahan version we can audio control while still have
...
workint twitch
2020-07-20 09:30:39 +02:00
383352c61c
SL-13567 Users should have separate CEF contexts
2020-07-17 19:00:58 +03:00
77f56fa7bf
Merge branch 'DRTVWR-512' of https://bitbucket.org/lindenlab/viewer
2020-05-31 15:27:02 +02:00
2603595f6d
Windows; update dullahan to latest version.
2020-05-31 05:44:56 +02:00
8737bd009c
Linux; Don't unconditionally disable GPU for CEF anymore.
...
If the new CEF still makes problems it makes more sense to use a debug
setting, then extend LLPluginClassMedia with a message to send a gpu_disabled
message. This can be send from LLViewerMediaImpl::newSourceFromMediaType.
2020-05-24 19:00:28 +02:00
466393fc0d
Pull in new dullahan.
2020-05-08 22:58:14 +02:00
9c78928311
Initial port of the changes from DRTVWR509 (Adult Swim) minus the volume fall-off settings updates
2020-04-28 10:57:17 -07:00
3789a192dc
Merge viewer-lynx
2019-10-16 22:48:57 +02:00
6ea01a8c4a
Merge fix
2019-10-16 14:04:53 +03:00
a94d482dd4
Merge viewer-neko
2019-10-16 00:41:04 +02:00
b1ae8def22
Merge Firestorm LGPL
2019-10-15 23:34:02 +02:00
d7f73cfc5b
Backed out changeset: eb99f42d0fdc
2019-10-15 21:15:32 +03:00
885c56a660
Downstream merge from lindenlab/viewer-bear
2019-10-15 20:36:12 +03:00
d59cd13de1
Merge viewer-bear
2019-10-09 22:43:10 +02:00
2f7b606202
Backed out changeset: 8e228364f324
2019-09-14 05:14:24 +03:00
548d688adf
Backed out changeset: b4182ee25942
2019-09-14 05:14:07 +03:00
ddbe9583ff
Backed out changeset: a6398f90389a
2019-09-14 05:13:53 +03:00
6d6b70d062
Merge Firestorm LGPL
2019-08-13 22:26:19 +02:00
a138f375af
Merge Firestorm LGPL
2019-08-13 21:35:59 +02:00
cdcdc4b3e3
Merged in lindenlab/viewer-bear
2019-08-13 21:59:37 +03:00
823cef92ed
Merged in lindenlab/viewer-lynx
2019-08-13 21:58:10 +03:00
ef423bfb81
Merged in lindenlab/viewer-release
2019-08-13 21:54:23 +03:00
Ansariel