Ansariel
|
6ccdf5545d
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
|
2022-05-27 11:41:45 +02:00 |
|
Ansariel
|
7991aaffa0
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-05-05 09:59:12 +02:00 |
|
Ansariel
|
6e83be2167
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-04-29 14:27:09 +02:00 |
|
Nicky
|
5b7825df1e
|
Update SDL2.
|
2022-04-25 21:25:46 +02:00 |
|
Nicky
|
e5f684f085
|
Make SDL2 a cmake option, use SDL2 Mixer for audio playback, this might open a good way to a full open source way (no FModStudio needed). But here be dragons still.
|
2022-04-25 21:24:29 +02:00 |
|
Ansariel
|
b8b0c8ec3b
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-04-19 15:42:14 +02:00 |
|
Ansariel
|
c1a4be7dae
|
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/llappearance/lltexlayer.cpp
# indra/llinventory/llparcel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
|
2022-04-19 13:21:52 +02:00 |
|
Ansariel
|
1aaa765d26
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-04-19 12:33:48 +02:00 |
|
Ansariel
|
ad0aa3422f
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
|
2022-04-19 00:23:41 +02:00 |
|
Ansariel
|
07040f7eb0
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-04-19 00:15:01 +02:00 |
|
Andrey Lihatskiy
|
dbb044e9bb
|
Merge branch 'master' into DRTVWR-543-maint
|
2022-04-18 20:38:06 +03:00 |
|
Andrey Kleshchev
|
94973e736c
|
SL-17224 Update FMOD to version 2.02.06
|
2022-04-15 21:27:50 +03:00 |
|
Nicky
|
d898151f25
|
Linux; update glib, fmodstudio and kdu
|
2022-04-01 15:25:40 +00:00 |
|
Nat Goodspeed
|
9e2f571687
|
SL-17079: Merge 'sl-17079' into DRTVWR-540-maint for updater fix.
|
2022-03-28 16:43:22 -04:00 |
|
Kitty Barnett
|
4ae2ce7d92
|
Update FMOD Studio to 2.02.06 on Mac
|
2022-03-28 17:19:25 +02:00 |
|
Ansariel
|
2a4cecdc6c
|
Update FMOD Studio to 2.02.06 on Windows
|
2022-03-28 11:15:02 +02:00 |
|
Nat Goodspeed
|
9d7f8156c6
|
SL-17079: Update to viewer-manager build 569958
|
2022-03-25 15:53:28 -04:00 |
|
Ansariel
|
b79d1ac171
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-03-08 14:19:36 +01:00 |
|
Nicky
|
ae4a769345
|
Update 3p for voice again, remove some so's that causes problems.
|
2022-03-06 20:07:45 +01:00 |
|
Andrey Kleshchev
|
3e1619d2fc
|
SL-14541 Pull in updated collada
|
2022-03-05 22:52:00 +02:00 |
|
Andrey Kleshchev
|
51e318fd8d
|
SL-14541 Pull in updated zlib-ng
Nicky Dasmijn's contribution for zlib-ng Linux builds
|
2022-03-05 11:34:13 +02:00 |
|
Ansariel
|
ef88337eef
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
|
2022-03-02 10:12:19 +01:00 |
|
Nicky
|
de70b18dd1
|
Linux; Update slvoice, include 32 bit libs.
|
2022-03-01 22:44:44 +01:00 |
|
Ansariel
|
892500ee41
|
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
|
2022-03-01 19:34:34 +01:00 |
|
Ansariel
|
d34e3a9ab4
|
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
|
2022-03-01 19:31:32 +01:00 |
|
Ansariel
|
e10dea5fe2
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-03-01 18:09:12 +01:00 |
|
Ansariel
|
25f974d77d
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-03-01 10:00:36 +01:00 |
|
Ansariel
|
c5e258f40f
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-03-01 08:38:19 +01:00 |
|
Andrey Lihatskiy
|
fa9d4927f4
|
Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into DRTVWR-543-maint
# Conflicts:
# autobuild.xml
|
2022-03-01 02:59:15 +02:00 |
|
Nicky
|
43031968a6
|
Merge remote-tracking branch 'll/master'
|
2022-02-28 22:04:05 +01:00 |
|
Andrey Lihatskiy
|
201f83472c
|
Merge branch 'master' into DRTVWR-543-maint
|
2022-02-28 21:55:28 +02:00 |
|
Andrey Lihatskiy
|
73eec89131
|
Merge branch 'master' into DRTVWR-540-maint
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
|
2022-02-28 21:54:21 +02:00 |
|
Ansariel
|
0aa59b2bee
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-02-22 13:40:40 +01:00 |
|
Nicky
|
0bd3e3d53a
|
Merge branch 'linux_crashlogger'
|
2022-02-21 08:14:04 +01:00 |
|
Nicky
|
7dd7abf396
|
Bring back gstreamer, remove the old and unmaintained Linux VLC version.
|
2022-02-20 21:24:37 +01:00 |
|
Nicky
|
2db46702c4
|
Linux; Update curl
|
2022-02-20 20:46:18 +01:00 |
|
Nicky
|
4a311d6266
|
Bring back llappearance_utility.
|
2022-02-18 21:19:06 +01:00 |
|
Ansariel
|
f0352ff093
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-02-16 09:49:24 +01:00 |
|
Ansariel
|
2baf4589ff
|
Merge branch 'DRTVWR-553-555' of https://bitbucket.org/lindenlab/viewer
|
2022-02-16 09:47:28 +01:00 |
|
Nat Goodspeed
|
a6430f42f3
|
SL-16842, SL-14300: Merge branch 'DRTVWR-555' into DRTVWR-553-555
|
2022-02-15 16:11:59 -05:00 |
|
Nat Goodspeed
|
f09b0a6a08
|
SL-16842, SL-14300: Update to viewer-manager build 568552
|
2022-02-15 16:10:36 -05:00 |
|
Nicky
|
ee4249378a
|
Spring cleaning, remove all traces of old 32 bit darwin/linux packages.
|
2022-02-11 22:11:18 +01:00 |
|
Nat Goodspeed
|
7491a56144
|
SL-16842: Merge 'DRTVWR-555' into DRTVWR-553-555 for updater fix.
|
2022-02-11 13:58:49 -05:00 |
|
Nat Goodspeed
|
78e32d943e
|
SL-16842: Update to viewer-manager build 568451
|
2022-02-11 13:58:04 -05:00 |
|
Ansariel
|
31e8e6fac0
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-02-10 12:42:15 +01:00 |
|
Nicky
|
75256ae308
|
Merge with boost update
|
2022-02-09 23:05:16 +01:00 |
|
Nicky
|
c7f39b5043
|
Linux; bring back breakpad. No upload to bugsplat implemented yet.
|
2022-02-09 23:04:31 +01:00 |
|
Nicky
|
0700482f66
|
Update boost and colladadom with packages build on Bionic Beaver, good bye Xenial Xerus old friend, you served us well over the years.
|
2022-02-09 21:57:11 +00:00 |
|
Nat Goodspeed
|
9bd45e6fab
|
SL-13792: Merge branch 'DRTVWR-555' into DRTVWR-553-555.
This picks up the change to 32-bit Windows viewer-manager.
|
2022-02-08 20:09:52 -05:00 |
|
Nat Goodspeed
|
846413c961
|
DRTVWR-555: Update to viewer-manager build 568310
|
2022-02-08 20:08:42 -05:00 |