livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,259 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

465 Commits (c5e3ace94de01ed61ed43284ea72dacec197cdc9)

Author SHA1 Message Date
Andrey Kleshchev 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
Andrey Lihatskiy 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
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Andrey Lihatskiy edb6293528 Merge branch 'master' into DRTVWR-530-maint 2021-12-15 21:50:40 +02:00
Andrey Kleshchev 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
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Andrey Lihatskiy 0505c6ebbb Merge branch 'master' into DRTVWR-534 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
 2021-11-16 01:21:55 +02:00
Andrey Lihatskiy 30c381406c Merge branch 'master' into DRTVWR-530-maint 
# Conflicts:
#	doc/contributions.txt
 2021-11-16 01:09:11 +02:00
Andrey Lihatskiy 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
Andrey Lihatskiy 8dd9554eb5 SL-16333 VLC 3 doesn't support -1 == infinity for input-repeat 
by Callum
 2021-11-09 02:38:58 +02:00
Andrey Lihatskiy 8acce67f95 SL-16247 Post-d520 libvlc plugin fixes 
by Callum
 2021-10-28 00:52:03 +03:00
Andrey Lihatskiy 07aa342bc4 Merge branch 'master' into DRTVWR-530-maint 
# Conflicts:
#	autobuild.xml
 2021-10-22 15:27:15 +03:00
Andrey Lihatskiy f1a7e400a2 Merge branch 'master' into DRTVWR-527-maint 
# Conflicts:
#	autobuild.xml
 2021-10-22 15:03:00 +03:00
Andrey Kleshchev a701165522 SL-16047 Strip unused includes 2021-10-18 17:36:14 +03:00
Dave Parks 851767b808 SL-16131 Fix for alignment warnings on Win32 builds. 2021-10-14 17:41:38 +00:00
Callum Prentice 8a1bc1b9e2 Merge with head of Master after a new Viewer release 2021-10-13 14:47:06 -07:00
Callum Linden 454c7f4543 Fix: SL-12320 The Viewer functionality is broken with an in-viewer enabled proxy 2021-10-07 20:16:54 +03:00
Callum Prentice 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
Andrey Lihatskiy 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
Andrey Lihatskiy 9ac1a63a41 Merge branch 'master' into DRTVWR-530-maint 2021-08-10 06:43:59 +03:00
Callum Prentice a242edc99d Merge with Master after Viewer Release (also fixed some glaring automerge screw ups) 2021-07-19 17:43:19 -07:00
Callum Prentice 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
Callum Prentice 3602d64a09 Fix for SL-15559 PDF files do not load in CEF v91 2021-07-12 12:50:34 -07:00
Callum Prentice 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
Callum Prentice c705126d0b Fixes SL-14897 Disable Flash support in the embedded browser 2021-05-14 15:21:06 -07:00
Andrey Lihatskiy a442f8b451 Revert "Merge branch 'DRTVWR-531' into DRTVWR-516-maint" 
This reverts commit 07456abe92, reversing
changes made to 8a33636e8f.
 2021-05-13 20:29:01 +03:00
Andrey Kleshchev 5cde118ec8 SL-14664 Added zoomout and sizeall 
Remade code to use getCursorFromString
 2021-04-27 23:08:54 +03:00
Andrey Kleshchev e5136cd19b SL-14664 Added 'alias' 2021-04-27 20:51:23 +03:00
Andrey Kleshchev 8b3f4b56f9 SL-14664 Increase range of supported cursors on prim's media 2021-04-26 23:55:45 +03:00
Callum Prentice 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
Andrey Lihatskiy b9bcfad195 Merge branch 'master' into DRTVWR-520-apple-notarization 2020-11-11 22:45:54 +02:00
Andrey Lihatskiy 1811cdc447 SL-14044 Windows build fix 2020-10-01 08:44:30 +03:00
Andrey Kleshchev 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
Andrey Lihatskiy f77a30f740 Merge branch 'master' into DRTVWR-507-maint 
# Conflicts:
#	autobuild.xml
 2020-07-21 11:30:48 +03:00
Andrey Kleshchev 383352c61c SL-13567 Users should have separate CEF contexts 2020-07-17 19:00:58 +03:00
Nat Goodspeed 77cf4588df DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476 
following release of D512.
 2020-06-23 22:03:43 -04:00
Callum Prentice 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
Nat Goodspeed b1477e98f6 DRTVWR-494: Fix Windows macro collisions in windows_volume_catcher 
by tweaking #include order.
 2020-03-25 15:28:17 -04:00
andreykproductengine 6ea01a8c4a Merge fix 2019-10-16 14:04:53 +03:00
AndreyL ProductEngine d7f73cfc5b Backed out changeset: eb99f42d0fdc 2019-10-15 21:15:32 +03:00
AndreyL ProductEngine 885c56a660 Downstream merge from lindenlab/viewer-bear 2019-10-15 20:36:12 +03:00
AndreyL ProductEngine 2f7b606202 Backed out changeset: 8e228364f324 2019-09-14 05:14:24 +03:00
AndreyL ProductEngine 548d688adf Backed out changeset: b4182ee25942 2019-09-14 05:14:07 +03:00
AndreyL ProductEngine ddbe9583ff Backed out changeset: a6398f90389a 2019-09-14 05:13:53 +03:00
AndreyL ProductEngine cdcdc4b3e3 Merged in lindenlab/viewer-bear 2019-08-13 21:59:37 +03:00
AndreyL ProductEngine 823cef92ed Merged in lindenlab/viewer-lynx 2019-08-13 21:58:10 +03:00
AndreyL ProductEngine ef423bfb81 Merged in lindenlab/viewer-release 2019-08-13 21:54:23 +03:00
AndreyL ProductEngine e047bb09ba SL-10962 Support for suppressing JavaScript dialogs in the media plugin code 2019-07-25 17:50:40 +03:00
andreykproductengine 23591b8ab7 SL-3704 Plugin exit issues 2019-07-01 17:28:58 +03:00
AndreyL ProductEngine 16437e771b Merged in DRTVWR-492 2019-06-20 00:14:45 +03:00