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

1521 Commits (14dae8bc8ee55fdd027c7232e3dbcf7b7eedd3cc)

Author SHA1 Message Date
Nat Goodspeed 14dae8bc8e SL-16220: Merge branch 'master' into sl-16220 2021-10-22 11:54:18 -04:00
Andrey Lihatskiy 717fe2cc5c DRTVWR-520 Updated dullahan to codeticket build 563968 2021-09-23 10:57:37 +03:00
Andrey Lihatskiy 4a411d9896 Revert "DRTVWR-520 Updated dullahan to codeticket build 562751" 
This reverts commit adb724564d.
 2021-09-21 19:31:04 +03:00
Ptolemy 13ff2cba53 SL-15709: Add Darwin support 2021-09-03 17:53:44 -07:00
Dave Houlton 2e88a32665 SL-15595 update viewer autobuild to import tracy lib 2021-09-03 17:53:43 -07:00
Andrey Lihatskiy adb724564d DRTVWR-520 Updated dullahan to codeticket build 562751 2021-08-12 23:13:18 +03: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
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 38765be8b0 Fix for: SL-15433 Update version of CEF used in the Viewer to 91.0.4472.114 2021-06-21 19:18:58 -07:00
Callum Prentice 45135a7c58 Fix for: SL-15422 Update version of CEF used in the Viewer to 91.0.4472.101. Also includes a tweak to viewer_manifest.py to handle some CEF file changes" 2021-06-17 12:42:58 -07:00
Andrey Kleshchev b91561e982 SL-15211 Update OpenSSL library 2021-05-27 12:56:35 +03: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
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 Lihatskiy 07456abe92 Merge branch 'DRTVWR-531' into DRTVWR-516-maint 2021-05-11 21:27:58 +03:00
Andrey Lihatskiy 933b98880e DRTVWR-520 Updated uriparser to codeticket build 559132 2021-05-01 02:14:54 +03:00
Andrey Lihatskiy 789be6b933 Merge branch 'master' into DRTVWR-520-apple-notarization 2021-04-30 03:05:19 +03:00
Callum Prentice e41412edda Merge remote-tracking branch 'origin/master' into DRTVWR-531 2021-04-29 13:41:02 -07:00
Andrey Kleshchev 3f31901640 Merge master (DRTVWR-515) into DRTVWR-516-maint 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/llcoros.cpp
#	indra/llmessage/llcoproceduremanager.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
#	indra/newview/llfloaterimsessiontab.cpp
 2021-04-29 21:00:25 +03:00
Andrey Lihatskiy 3623e6eb8a DRTVWR-520 Updated dullahan to codeticket build 558653 2021-04-22 09:37:50 +03:00
Andrey Lihatskiy 9080c818e0 DRTVWR-520 Updated apr_suite to codeticket build 558565 2021-04-21 07:04:53 +03:00
Andrey Lihatskiy 5d4ca2edfb DRTVWR-520 Updated slvoice to codeticket build 558436 2021-04-21 07:01:01 +03:00
Andrey Kleshchev 2de92430ef Revert "SL-15141 Update CURL to 7.76.1" due to OPS-4251 
This reverts commit 45b5ac72b2 and updates curl links
 2021-04-20 19:42:39 +03:00
Andrey Kleshchev 45b5ac72b2 SL-15141 Update CURL to 7.76.1 
CURLE_SSL_CACERT is now identical to CURLE_SSL_PEER_CERTIFICATE
 2021-04-20 02:12:16 +03:00
Callum Prentice 75f26d123d Update to Chromium version 89.0.4389.114 2021-04-13 09:36:50 -07:00
Callum Prentice 2dbd5c5762 Pull in macOS version of CEF 89 2021-04-01 14:38:19 -07:00
Callum Prentice 930b8ed36e Merge with ti of master after Viewer release 2021-04-01 14:35:28 -07:00
Andrey Lihatskiy 9fe758e8bc Merge branch 'master' into DRTVWR-516-maint 2021-04-01 20:45:16 +03:00
Andrey Lihatskiy 6240168f24 Merge branch 'master' into DRTVWR-515-maint 2021-04-01 20:45:06 +03:00
Andrey Lihatskiy b6883636ff Updated llca to codeticket build 557744 2021-04-01 12:42:59 +03:00
Andrey Kleshchev 6b73a8331f SL-14541 removed breakpad, win_crash_logger, updated zlib 2021-03-17 00:19:38 +02:00
Andrey Lihatskiy 3b7771756b Revert "Updated llca to codeticket build 556422" 
This reverts commit 4add069cae.
 2021-03-03 21:16:23 +02:00
Callum Prentice b1add74c31 Pull in the newest Dullahan 1.10.x with CEF/Chromium 89.x 2021-03-03 10:09:27 -08:00
Andrey Lihatskiy 4add069cae Updated llca to codeticket build 556422 2021-03-01 23:49:13 +02: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 Kleshchev bc8bf1cb54 SL-13788 Detecting Intel HD 400 as just Intel HD 
CPU based detection in case Intel HD Graphics got detected
 2021-02-24 14:41:21 +02:00
Andrey Lihatskiy 5f4f0d2936 DRTVWR-520 Updated colladadom to codeticket build 556305 2021-02-23 23:59:11 +02:00
Andrey Lihatskiy a0335671d5 DRTVWR-520 Updated googlemock to codeticket build 556304 2021-02-23 23:34:25 +02:00
Andrey Lihatskiy c2660c152f DRTVWR-520 Updated boost to codeticket build 556301 2021-02-23 23:07:54 +02:00
Callum Prentice 329d490036 First set of changes to make Dullahan build with CEF v88 2021-02-22 16:38:05 -08:00
Andrey Kleshchev 31bb38a6f3 SL-13788 Some Intel gpus are recognized as just Intel HD Graphics 2021-02-18 18:11:20 +02:00
Andrey Lihatskiy e320a463ac DRTVWR-520 Updated dullahan to codeticket build 555904 2021-02-10 22:02:59 +02:00
Andrey Lihatskiy fc166dabc0 DRTVWR-520 Updated fmod to codeticket build 555883 2021-02-10 15:59:04 +02:00
Andrey Lihatskiy fd8eab7e61 DRTVWR-520 Updated fmod to codeticket build 555876 2021-02-10 13:14:28 +02:00
Andrey Lihatskiy 2da7bc83b5 Updated LLCA to codeticket build 555615 2021-02-02 19:08:12 +02:00
Andrey Kleshchev 44b6459dfa Merge branch 'master' into DRTVWR-514-keymappings 
# Conflicts:
#	indra/llui/llscrolllistctrl.cpp
 2021-02-01 23:33:41 +02:00
Andrey Kleshchev 7396a528c0 Temporary revert "Updated LLCA to codeticket build 555537" 
This reverts commit eac0f1857c.
 2021-02-01 23:03:56 +02:00
Andrey Kleshchev 609a26b59a Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint 
# Conflicts:
#	autobuild.xml (llca)
#	indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
#	indra/newview/llscenemonitor.cpp (SL-14422)
#	indra/newview/llvovolume.cpp (SL-12069)
 2021-02-01 22:28:15 +02:00
Andrey Lihatskiy d07f52da62 Merge branch 'master' into DRTVWR-520-apple-notarization 2021-02-01 22:11:44 +02:00
Andrey Lihatskiy eac0f1857c Updated LLCA to codeticket build 555537 2021-02-01 09:22:53 +02:00
Andrey Lihatskiy 1fd44923b5 DRTVWR-520 Updated dullahan to codeticket build 555532 2021-02-01 04:00:41 +02:00