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

1494 Commits (b41f6cd2b522f3ff8effdd17f63c067a468cd4e0)

Author SHA1 Message Date
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 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
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
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
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 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
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 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 eac0f1857c Updated LLCA to codeticket build 555537 2021-02-01 09:22:53 +02:00
Andrey Kleshchev 0e4faf7d9c SL-12198 Pull in updated version checker 2021-01-26 01:03:00 +02:00
Andrey Kleshchev 2f00eef6b4 SL-14597 Fixed mac library only including symlink 2021-01-16 13:16:12 +02:00
Andrey Kleshchev 3d525fbf18 SL-14597 Pulled in updated uriparser 
Due to crash inside uriparser's code
 2021-01-16 01:06:16 +02:00
Andrey Lihatskiy e7a98c7dc0 Updated LLCA to codeticket build 553112 2020-12-02 04:03:06 +02:00
Andrey Kleshchev 10fa792e11 SL-14393 Updater update 
Switch Intel HD4000 and HD2500 off of forced 32-bit
 2020-11-25 01:37:10 +02:00
Andrey Kleshchev fb17b94f0f SL-14012 Crashes from Win10 are sent with uninformative callstacks #2 2020-11-19 20:46:52 +02:00
Andrey Kleshchev 273fbb3238 SL-14201 Fix Altgr in CEF 
Moved from D521
 2020-11-16 18:48:38 +02:00
Andrey Lihatskiy 0bba892bb0 Merge branch 'master' into DRTVWR-515-maint 
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
 2020-11-13 18:22:43 +02:00
Andrey Lihatskiy 0303dd8179 Merge branch 'master' into DRTVWR-513-maint 
# Conflicts:
#	autobuild.xml
#	indra/llui/llfolderviewmodel.h
#	indra/newview/lltexturecache.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
 2020-11-11 22:14:24 +02:00
Mnikolenko Productengine dfc406f0ff SL-13283 Update favicons with new logo 2020-11-06 19:51:36 +02:00
Andrey Kleshchev 5b023c8ae6 SL-13740 Updated updater 2020-11-06 18:19:21 +02:00
Andrey Lihatskiy 597d777c9f Updated LLCA to codeticket build 551526 2020-11-02 17:54:41 +02:00
Andrey Lihatskiy 4b2a611596 Updated LLCA to codeticket build 550026 2020-10-21 16:20:47 +03:00
Andrey Kleshchev f08421e651 SL-14012 Crashes from Win10 are sent with uninformative callstacks 
Simplify name generation according to slack discussion, also helps bugsplat with matching files
 2020-10-06 21:59:39 +03:00
Andrey Kleshchev 8803157a21 SL-13953 Builds should fail if symbols upload failed 2020-10-05 20:56:26 +03:00
Andrey Lihatskiy 5cae545e09 Updated LLCA to codeticket build 549857 2020-10-01 18:34:58 +03:00
Mnikolenko Productengine 108550e68e SL-13873 update copyright date to 2020 2020-09-25 16:29:05 +03:00
Andrey Lihatskiy 825cfc2b6a Merge branch 'master' into DRTVWR-507-maint 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterconversationpreview.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.h
#	indra/newview/llvoicevivox.cpp
 2020-09-22 23:30:12 +03:00
Andrey Lihatskiy 05b98ec861 Updated apr_suite to codeticket build 548882 2020-09-11 23:57:31 +03:00
Andrey Lihatskiy 128f0833cf Updated LLCA to codeticket build 548269 2020-09-03 20:03:29 +03:00
Andrey Lihatskiy f73eb32b37 Updated LLCA to codeticket build 548269 2020-09-01 23:12:31 +03:00
Andrey Lihatskiy a9885029cf Merge branch 'master' into DRTVWR-507-maint 2020-08-18 19:11:34 +03:00
Andrey Lihatskiy f29ac6757c Merge branch 'master' into DRTVWR-507-maint 2020-08-11 01:35:04 +03:00