Commit Graph

2468 Commits (f65f457f18d82f87f660d8e2bba261bda6fa6792)

Author SHA1 Message Date
Ansariel 0405613511 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-24 22:38:49 +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
Tonya Souther fd19a25282 KDU 8.1 for macOS. 2021-04-03 10:20:57 -05:00
Ansariel d271062749 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-02 16:53:23 +02: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
Nicky 242a312159 Update tracy 2021-03-31 23:30:07 +02:00
Nicky d3ed0015f5 Windows; KDU 8.1 2021-03-28 14:10:09 +02:00
Ansariel 73bc62975e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-27 17:48:51 +01:00
Nicky 8387c0e6cf Linux; KDU update 2021-03-23 17:47:31 +01:00
Ansariel af4e66d521 Add Tracy 3p to autobuild.xml 2021-03-22 01:06:53 +01:00
Nicky 493200bca5 Undo Linux updates. 2021-03-09 10:40:01 +01:00
Ansariel 888dce7482 Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llcommon/llsys.cpp
2021-03-03 21:12:21 +01: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
Ansariel 748a53b8a7 Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2021-02-18 19:33:48 +01:00
Andrey Kleshchev 31bb38a6f3 SL-13788 Some Intel gpus are recognized as just Intel HD Graphics 2021-02-18 18:11:20 +02:00
Nicky 4e3cd245e6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates 2021-02-15 17:46:45 +01:00
Ansariel 078b8b0e54 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 12:32:08 +01:00
Ansariel 098f79d7b6 Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2021-02-15 11:42:22 +01:00
Ansariel e4f0270887 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 11:41:48 +01:00
Nicky b4afa5f1b8 Update jemalloc. 2021-02-14 14:05:51 +01:00
Tonya Souther d82b4b9540 FMOD Studio 2.01.08 for macOS. 2021-02-13 10:04:56 -06:00
Nicky e9e203412d Linux; fmodstudio-2.01.08 2021-02-13 16:31:40 +01:00
Ansariel 69dee9509c Update FMOD Studio to 2.01.08 on Windows 2021-02-12 16:04:33 +01:00
Nicky 24b2f60d1a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates 2021-02-06 00:18:07 +01:00
Andrey Lihatskiy 2da7bc83b5 Updated LLCA to codeticket build 555615 2021-02-02 19:08:12 +02:00
Ansariel 5bc39cd87d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-02 17:50:49 +01:00
Ansariel 7ca874a6e3 Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2021-02-02 00:16:25 +01:00
Ansariel 7458601374 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-02 00:05:53 +01: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
Ansariel b61a998574 Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2021-01-17 19:29:33 +01:00
Ansariel 1461e9bbb0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-01-17 19:24:26 +01:00
Ansariel 52b3bb404c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-01-17 12:38:03 +01: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
Ansariel 2ba8e979b0 It's 2021... 2021-01-03 23:35:35 +01:00
Tonya Souther 5e3d5306ee FMOD Studio 2.01.07 for macOS. 2021-01-01 03:57:40 -06:00
Ansariel 28f289ef1d FIRE-30632: Bulk Windlight import 2020-12-30 20:11:48 +01:00
Yay N Stuff c3b599af75 Linux: Update FMOD to version 2.01.07 2020-12-27 19:17:34 -08:00
Ansariel 9d0576be83 Update FMOD Studio to 2.01.07 on Windows 2020-12-21 18:48:04 +01:00
Ansariel 0ba281e843 Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-12-08 09:41:10 +01:00
Ansariel 6c587d437d Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2020-12-02 08:17:58 +01: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
Nicky b728ee7a23 Update dullahan. 2020-11-21 14:00:19 +01:00