Commit Graph

2515 Commits (cc5f95c229b63e8fbc4dccd23db0d2651660b73d)

Author SHA1 Message Date
Nicky cc5f95c229 Remove gtk/atk dependency by using fltk instead. 2021-09-26 20:38:41 +02:00
Nicky e0b7570685 Linx, Update CEF once more, tweak packaging. 2021-09-13 13:11:56 +02:00
Nicky 035befac70 Linux; Update CEF. 2021-09-12 01:24:08 +02:00
Nicky 07fb63a528 OSX; KDU 8.2 2021-08-31 14:44:39 +02:00
Nicky de3f5d2ed6 Linux; KDU 8.2 2021-08-23 18:19:37 +02:00
Nicky b2569a06e6 Windows; Update KDU to 8.2 2021-08-23 17:55:59 +02:00
Ansariel ca4e15c930 Merge branch 'DRTVWR-531' of https://bitbucket.org/lindenlab/viewer 2021-08-09 14:27:13 +02:00
Nicky 7c81cd821f Linux FMOD Studio 2.02.02 2021-08-01 09:01:15 +02:00
Ansariel 81ae59fea5 Update FMOD Studio to 2.02.02 on Windows 2021-07-30 01:44:32 +02: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
Ansariel 347a35540b Update version meta info as well 2021-07-19 23:23:51 +02:00
Ansariel 8d03072b29 Updated Havok TPV lib 2021-07-19 23:20:14 +02:00
Tonya Souther 238ce718a6 FIRE-31062: Rebuild KDU for macOS to allow running on older versions. 2021-07-15 22:28:06 -05:00
Ansariel b758c75584 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-15 13:30:05 +02:00
Nicky 8aab2b57dd Linux/OSX FMOD Studio 2.02.01 2021-07-13 20:15:03 +02:00
Ansariel 006e1ff01d FMOD Studio 2.02.01 for Windows 2021-07-13 14:13:25 +02: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
Ansariel 2ea6f51200 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm 2021-05-25 09:11:03 +02: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
Ansariel fcfaa2d735 Update OpenJPEG to 2.4.0 for Windows 2021-05-16 16:20:19 +02:00
Ansariel 9826ae6967 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-05-13 23:26:52 +02: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
Ansariel cd3b20552c Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-05-11 21:09:19 +02:00
Andrey Lihatskiy 07456abe92 Merge branch 'DRTVWR-531' into DRTVWR-516-maint 2021-05-11 21:27:58 +03:00
Tonya Souther d4f1140e60 FMOD Studio 2.01.09 for macOS. 2021-05-05 17:53:13 -05:00
Ansariel d9183063a8 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-516 2021-05-04 19:37:12 +02:00
Nicky ec2d230323 Linux; Update open_libndofdev 2021-05-01 13:13:12 +02:00
Nicky 1124ec1cd4 Linux; Updated uriparser 2021-05-01 12:17:34 +02:00
Ansariel 94534f4c88 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-30 23:25:06 +02: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
Ansariel 0405613511 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-24 22:38:49 +02:00
Ansariel ade99f8f6e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-22 07:18:44 +02:00
Nicky af2fd21780 Linux; Update fmodstudio to 2.01.09. 2021-04-20 15:31:30 +02:00
Ansariel e5be0b6ee1 FMOD update to 2.01.09 on Windows 2021-04-19 11:34:41 +02:00
Ansariel 4841acd297 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-17 22:44:52 +02:00
Ansariel c9a9936edd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-16 23:01:15 +02:00
Callum Prentice 75f26d123d Update to Chromium version 89.0.4389.114 2021-04-13 09:36:50 -07:00
Tonya Souther fd19a25282 KDU 8.1 for macOS. 2021-04-03 10:20:57 -05:00
Ansariel db72dc7d0f Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-02 19:33:18 +02:00
Ansariel d271062749 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-02 16:53:23 +02: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
Ansariel 3d9d0189e5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-01 19:41:03 +02:00
Ansariel 98f8912e25 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-01 16:49:55 +02:00
Andrey Lihatskiy b6883636ff Updated llca to codeticket build 557744 2021-04-01 12:42:59 +03:00
Nicky 242a312159 Update tracy 2021-03-31 23:30:07 +02:00