Commit Graph

2417 Commits (748a53b8a7aff46219a682ecc396b0ee38adc79d)

Author SHA1 Message Date
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
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
Andrey Lihatskiy 2da7bc83b5 Updated LLCA to codeticket build 555615 2021-02-02 19:08:12 +02: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
Ansariel 467412d09d Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-20 23:10:28 +01:00
Andrey Kleshchev fb17b94f0f SL-14012 Crashes from Win10 are sent with uninformative callstacks #2 2020-11-19 20:46:52 +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
Ansariel 3b630f2cda Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-12 17:06:16 +01:00
Ansariel af2abe17cd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 00:51:42 +01: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
Nicky b96eaf544c Linux; update dullahan 2020-11-06 18:31:46 +01:00
Andrey Kleshchev 5b023c8ae6 SL-13740 Updated updater 2020-11-06 18:19:21 +02:00
Ansariel 538e8fb64e Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-05 09:22:31 +01:00
Ansariel af61974386 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-05 09:14:11 +01:00
Andrey Lihatskiy 597d777c9f Updated LLCA to codeticket build 551526 2020-11-02 17:54:41 +02:00
Ansariel f2dd267bfa Update version string 2020-10-26 12:17:30 +01:00
Tonya Souther 5e4f8c1185 OpenJPEG 2 for macOS. 2020-10-26 01:09:54 -05:00
Nicky 085886fe69 OpenJPEG 2 for Linux. 2020-10-25 19:03:39 +01:00
Ansariel 08092b6110 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-10-24 19:53:24 +02:00
Tonya Souther 4579730714 Update macOS FMOD Studio to 2.01.05. 2020-10-24 09:53:01 -05:00
Ansariel df1999f953 Merge 2020-10-22 22:31:40 +02:00
Andrey Lihatskiy 4b2a611596 Updated LLCA to codeticket build 550026 2020-10-21 16:20:47 +03:00
Nicky 2db220b9e4 Linux; Update to fmodstudio-2.01.05 2020-10-19 13:56:17 +02:00
Ansariel 95b4dd072e Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-10-15 11:37:14 +02:00