201f83472c
Merge branch 'master' into DRTVWR-543-maint
2022-02-28 21:55:28 +02:00
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
0aa59b2bee
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-22 13:40:40 +01:00
0bd3e3d53a
Merge branch 'linux_crashlogger'
2022-02-21 08:14:04 +01:00
7dd7abf396
Bring back gstreamer, remove the old and unmaintained Linux VLC version.
2022-02-20 21:24:37 +01:00
2db46702c4
Linux; Update curl
2022-02-20 20:46:18 +01:00
4a311d6266
Bring back llappearance_utility.
2022-02-18 21:19:06 +01:00
f0352ff093
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-16 09:49:24 +01:00
2baf4589ff
Merge branch 'DRTVWR-553-555' of https://bitbucket.org/lindenlab/viewer
2022-02-16 09:47:28 +01:00
a6430f42f3
SL-16842, SL-14300: Merge branch 'DRTVWR-555' into DRTVWR-553-555
2022-02-15 16:11:59 -05:00
f09b0a6a08
SL-16842, SL-14300: Update to viewer-manager build 568552
2022-02-15 16:10:36 -05:00
ee4249378a
Spring cleaning, remove all traces of old 32 bit darwin/linux packages.
2022-02-11 22:11:18 +01:00
7491a56144
SL-16842: Merge 'DRTVWR-555' into DRTVWR-553-555 for updater fix.
2022-02-11 13:58:49 -05:00
78e32d943e
SL-16842: Update to viewer-manager build 568451
2022-02-11 13:58:04 -05:00
31e8e6fac0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-10 12:42:15 +01:00
75256ae308
Merge with boost update
2022-02-09 23:05:16 +01:00
c7f39b5043
Linux; bring back breakpad. No upload to bugsplat implemented yet.
2022-02-09 23:04:31 +01:00
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
afab8d6628
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-09 10:00:27 +01:00
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
846413c961
DRTVWR-555: Update to viewer-manager build 568310
2022-02-08 20:08:42 -05:00
967707cfd0
Merge branch 'DRTVWR-555' into DRTVWR-553+555
...
# Conflicts:
# autobuild.xml
# indra/newview/llappviewer.cpp
# indra/newview/viewer_manifest.py
2022-02-08 23:22:59 +02:00
2672518740
Update dullahan to a SDL2 compatible version.
2022-02-07 11:33:33 +01:00
e37f8c6020
SL-16788: Update to viewer-manager build 568156
2022-02-04 11:58:53 -05:00
ca26bb40ce
SL-16787 Updater launch issues.
2022-02-04 01:36:47 +02:00
1de684a8ea
SL-13792: Update to viewer-manager build 568036
2022-02-02 11:33:03 -05:00
472f4c0c73
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 12:24:32 +01:00
abe4857fd3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 10:13:39 +01:00
f669e46308
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 09:39:17 +01:00
a0dcfeb10e
SL-13792: Update to viewer-manager build 568005
2022-02-01 16:34:51 -05:00
7b6269fd10
SL-13792: Update to viewer-manager build 567997
2022-02-01 14:43:57 -05:00
2dd192ce36
DRTVWR-540 Updated LLCA to CT build 567974
2022-02-01 18:54:48 +02:00
91743a9dfa
SL-13792: Use new Python 3 SLVersionChecker.
...
On Mac, execute the packaged SLVersionChecker directly rather than invoking
system Python on our manually-bundled scripts.
2022-01-31 18:07:42 -05:00
ba31ac8efe
Remove old dbus code and replace it with a glib/gio implementation.
2022-01-27 22:00:35 +01:00
08fe29a658
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-22 11:46:16 +01:00
f3d96c7309
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-18 15:56:56 +01:00
a79e426c6b
Merge branch 'linux_fltk' to get rid of gtk/pango/atk/... 3p
2022-01-17 18:26:42 +01:00
7a8b63be87
Tabs to spaces.
2022-01-16 13:14:53 +01:00
d031507caa
Update FMOD Studio to 2.02.05 (Mac)
2022-01-16 01:24:02 +01:00
a0837a5298
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-14 13:46:29 +01:00
78f9a28191
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2022-01-13 21:12:09 +01:00
c741ba7cff
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-13 21:10:06 +01:00
f8441963fc
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
...
Final merge of DRTVWR-542 into DRTVWR-546, this only picks up a merge fix for updater.
2022-01-13 21:27:14 +02:00
61e5557d64
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-12 16:47:37 +01:00
f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
de7b3b081e
Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2022-01-11 08:58:39 +01:00
6c029e4858
DRTVWR-533 Updated LLCA to CT build 567162
2022-01-11 02:30:30 +02:00
95db09d8d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:31:49 +01:00
453c99af39
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-10 23:15:08 +01:00
81f2d2dc47
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-10 23:13:54 +01:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
f47ab322c0
Merge branch 'master' into linux_fltk
2022-01-10 14:00:42 +01:00
2fc0bb8979
Merge remote-tracking branch 'origin'
2022-01-10 13:47:43 +01:00
f9fa1475a8
Linux; Update to fmodstudio 2.02.05
2022-01-10 13:43:51 +01:00
290f23a548
Update FMOD Studio to 2.02.05 on Windows
2022-01-10 12:12:37 +01:00
d34e4fc7bf
Merge branch 'master' into linux_fltk
2022-01-10 09:31:04 +01:00
9ee93d36ba
SL-13297 - Update autobuild.xml for new 3p-slvoice dependency following commit message changes there.
2022-01-06 15:50:25 -08:00
9e30beb534
SL-13297 - bad copypasta
2022-01-06 15:44:48 -08:00
183261bc64
SL-13297 - Use new teamcity slvoice.
2022-01-06 15:44:30 -08:00
d65b5a868f
It's 2022...
2021-12-31 14:42:20 +01:00
970b6661cd
Merge branch 'master' into DRTVWR-543-maint
2021-12-26 14:01:17 +02:00
747dbb7da2
Merge branch 'master' into DRTVWR-540-maint
2021-12-26 14:01:06 +02:00
0953b6b646
Merge branch 'master' into linux_fltk
2021-12-21 00:39:10 +01:00
b7fd7a0cfb
Linux; new JS packages needed for 360 snapshot viewer.
2021-12-17 14:06:47 +01:00
d392b46984
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-17 09:21:55 +01:00
94498d9a32
Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer
2021-12-17 08:27:06 +01:00
38d21f99fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-17 08:26:39 +01:00
496156073b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-16 18:56:31 +01:00
2ba4a164e2
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Python.cmake
# indra/lib/python/indra/util/llmanifest.py
# indra/lib/python/indra/util/test_win32_manifest.py
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcommon/llerror.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lleventnotifier.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewanim.h
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/de/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ja/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ru/menu_place_add_button.xml
# indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
# indra/newview/viewer_manifest.py
2021-12-16 12:32:34 +01:00
6663bc6f85
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llviewercontrol.cpp
2021-12-16 09:49:35 +01:00
83b4ea59fc
Merge branch 'SL-15742' into DRTVWR-527-maint
2021-12-16 00:58:44 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
a3c1080295
Merge branch 'DRTVWR-552-cache-360' of https://bitbucket.org/lindenlab/viewer
2021-12-15 21:05:24 +01:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
2800905ac3
Merge branch master (DRTVWR-552) into DRTVWR-542-meshopt
...
+resolved viewer-manager's inherited conflict
2021-12-15 21:36:58 +02:00
aa309c2eef
updated viewer-manager after merge
2021-12-15 21:23:03 +02:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
ee554834b8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-15 19:31:19 +01:00
e5f5e08de3
Update Mac FMOD Studio to v2.02.04
2021-12-15 17:27:33 +01:00
f34682962d
Linux; Update FMOD Studio to 2.02.04
2021-12-12 14:04:49 +01:00
0b95b9d008
Merge branch 'master' into SL-15742
2021-12-11 10:29:37 -08:00
f729cfc33f
SL-15742: Convert build scripts to Python 3
...
This changeset makes it possible to build the Second Life viewer using
Python 3. It is designed to be used with an equivalent Autobuild branch
so that a developer can compile without needing Python 2 on their
machine.
Breaking change: Python 2 support ending
Rather than supporting two versions of Python, including one that was
discontinued at the beginning of the year, this branch focuses on
pouring future effort into Python 3 only. As a result, scripts do not
need to be backwards compatible. This means that build environments,
be they on personal computers and on build agents, need to have a
compatible interpreter.
Notes
- SLVersionChecker will still use Python 2 on macOS
- Fixed the message template url used by template_verifier.py
2021-12-10 14:42:49 -08:00
4cc5b249d8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-10 15:47:34 +01:00
0451952a8f
Update FMOD Studio to 2.02.04 on Windows
2021-12-10 15:44:27 +01:00
ea9aa51dfe
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2021-11-30 08:43:46 +01:00
d2e5a9b1fe
Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer
2021-11-30 00:37:46 +01:00
850767eb21
SL-16396 Updater fails with "takes exactly 3 arguments" error
2021-11-29 21:55:45 +02:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
98b416ff5c
SL-16396 Updater fails with "takes exactly 3 arguments" error
2021-11-23 22:56:05 +02:00
d958cc2fdf
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-20 21:06:54 +01:00
ece7c98446
Set the correct version
2021-11-19 09:44:24 +01:00
addec75adc
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-11-19 09:41:22 +01:00
49dd88e86c
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llviewerinput.cpp
2021-11-19 04:45:15 +02:00
9a1af101cd
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llvoicevivox.cpp
2021-11-19 04:38:19 +02:00
472509dff4
SL-16235 Update fmod to 2.02.03
2021-11-18 20:35:42 +02:00
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
969762f162
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 16:29:50 +01:00
ced9423261
Merge branch 'DRTVWR-534' of https://bitbucket.org/lindenlab/viewer
2021-11-16 12:17:26 +01:00
5ccdcf51a3
Merge branch master (DRTVWR-545) into DRTVWR-542-meshopt
2021-11-16 02:22:54 +02:00
0505c6ebbb
Merge branch 'master' into DRTVWR-534
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2021-11-16 01:21:55 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
4a59f6650f
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-15 18:10:02 +01:00
5534781acf
SL-15333 Crash in glh_init_extensions
2021-11-12 17:21:50 +02:00
d06c357bab
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-12 11:02:00 +01:00
6d84191e19
Actually try the latest VLC version from upstream
2021-11-11 18:19:54 +01:00
b14d460dca
Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer
2021-11-10 21:21:51 +01:00
6254497151
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-10 21:17:02 +01:00
33f52ee51d
SL-14403 Removed glod
2021-11-10 17:48:55 +02:00
4336023179
Fix typo breaking mac builds
2021-11-07 14:49:38 -08:00
3d795fde53
Revert to VLC 2.2.8
2021-11-07 20:10:49 +01:00
a37a36c408
SL-16299 Updated dullahan to CT build 565428; entitlements cleanup
2021-11-04 01:10:46 +02:00
98d96f0dea
Manually resolving conflicts after merge with DRTVWR-520
...
This reverts commit 0a745b4788
2021-11-02 22:55:55 +02:00
5c5a1973a1
Merge remote-tracking branch 'origin/master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/installers/darwin/apple-notarize.sh
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
2021-11-02 22:42:32 +02:00
6921edcc39
SL-16293 Updated vlc to CT build 565299
2021-11-01 21:23:12 +02:00
d2c3460a25
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-28 10:46:20 +02:00
2e760ae7dd
SL-16235 Update fmod to 2.02.03
2021-10-27 19:18:54 +03:00
185f605d69
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-23 00:27:43 +02:00
607229f861
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-10-23 00:25:21 +02:00
3f16aed5ae
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-23 00:24:22 +02:00
12d68c3f6c
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.h
2021-10-22 16:29:58 +03:00
bb92dae312
DRTVWR-530 Updated uriparser to codeticket build 564957
2021-10-22 15:32:06 +03:00
07aa342bc4
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# autobuild.xml
2021-10-22 15:27:15 +03:00
725fc6fa85
Fix for SL-16208 Introduce a canonical_repo tag into the autobuild.xml file for new 3p repos - no new code introduced in this pass
2021-10-19 15:23:08 -07:00
2935c125fe
Linux; Update openssl.
2021-10-16 14:17:39 +02:00
4bdc1843ca
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-14 22:50:36 +02:00
6b2e40157b
Merge branch 'master' v6.4.24 into DRTVWR-546
2021-10-13 16:41:24 -06:00
20e05a5c11
Merge branch master (DRTVWR-520) into DRTVWR-542-meshopt
2021-10-14 01:01:09 +03:00
8a1bc1b9e2
Merge with head of Master after a new Viewer release
2021-10-13 14:47:06 -07:00
fb170ffe21
Merge branch 'master' into DRTVWR-545-maint-mix
2021-10-14 00:35:08 +03:00
111fdfb897
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-10-12 14:33:22 +02:00
bff236d893
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 14:27:41 +02:00
8af72281f5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 13:34:50 +02:00
b7009017c5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 13:01:21 +02:00
160f44375e
Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer
2021-10-12 12:59:35 +02:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
0d0446ba81
OSX; Update FMOD Studio to 2.02.03
2021-09-29 00:27:02 +02:00
04e45c3bd8
Linux; Update FMOD Studio to 2.02.03
2021-09-29 00:23:47 +02:00
abd5f7a899
Linux; Update dullahan once more.
2021-09-28 23:58:53 +02:00
adcd08fbf4
Revert "Merge branch 'c++17' into DRTVWR-522-maint"
...
This reverts commit 203ea3a70a8e3f077886
2021-09-28 19:22:18 +03:00
ba9bc78ba1
Update FMOD Studio to 2.02.03 for Windows
2021-09-28 10:20:11 +02:00
ef7ee0a17b
Linux; Update the windows voice bundle, include windows 64 bit voice as a new option.
2021-09-27 00:27:49 +02:00
cc5f95c229
Remove gtk/atk dependency by using fltk instead.
2021-09-26 20:38:41 +02:00
717fe2cc5c
DRTVWR-520 Updated dullahan to codeticket build 563968
2021-09-23 10:57:37 +03:00
4a411d9896
Revert "DRTVWR-520 Updated dullahan to codeticket build 562751"
...
This reverts commit adb724564d
2021-09-21 19:31:04 +03:00
7a845ee23b
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-522
2021-09-20 12:59:14 +02:00
1bc442ac0b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-09-20 12:29:47 +02:00
e885a73b62
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-09-20 11:38:13 +02:00
f843a97aeb
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-09-20 11:26:51 +02:00
7f1ebf1df8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-09-20 11:24:49 +02:00
cd4f90e2c0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-09-20 11:18:53 +02:00
e0b7570685
Linx, Update CEF once more, tweak packaging.
2021-09-13 13:11:56 +02:00
035befac70
Linux; Update CEF.
2021-09-12 01:24:08 +02:00
b7dc69f147
SL-14541 Packages with fixed license label
2021-09-11 17:08:00 +03:00
da29b6be10
SL-14541 Package with fixed minizip-ng version recognition
2021-09-09 14:46:01 +03:00
5af8f15a05
SL-14541 Replace zlib with zlib-ng
2021-09-08 23:18:07 +03:00
13ff2cba53
SL-15709: Add Darwin support
2021-09-03 17:53:44 -07:00
2e88a32665
SL-15595 update viewer autobuild to import tracy lib
2021-09-03 17:53:43 -07:00
b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
ecf819b38b
DRTVWR-521 Updated llca to codeticket build 563493
2021-09-01 20:48:34 +03:00
f2cd97a055
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-31 14:49:52 +02:00
e0948b78b1
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-08-31 14:46:36 +02:00
07fb63a528
OSX; KDU 8.2
2021-08-31 14:44:39 +02:00
a29b1960c6
SL-15900 Update the version of three.js we build against to latest before pv release - I mssed up and commited a merge conflict which of course, broke everything - fixed now
2021-08-30 09:28:04 -07:00
d3280953df
SL-15900 Update the version of three.js we build against to latest before pv release - fixed
2021-08-27 16:41:52 -07:00
203ea3a70a
Merge branch 'c++17' into DRTVWR-522-maint
2021-08-27 19:24:05 +03:00
e3e2904847
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2021-08-24 14:57:18 +02:00
33c20ba190
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-24 14:49:13 +02:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
de3f5d2ed6
Linux; KDU 8.2
2021-08-23 18:19:37 +02:00
b2569a06e6
Windows; Update KDU to 8.2
2021-08-23 17:55:59 +02:00
0c89e67eb5
DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one.
2021-08-20 08:28:48 -07:00
76da77d2a9
SL-15588 Updated llphysicsextensions_tpv to codeticket version 562599
2021-08-14 00:12:24 +03:00
adb724564d
DRTVWR-520 Updated dullahan to codeticket build 562751
2021-08-12 23:13:18 +03:00
97f09de4fc
Merge branch 'master' into DRTVWR-520-apple-notarization
...
# Conflicts:
# autobuild.xml
# build.sh
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-12 23:13:12 +03:00
c80ad209b3
Merge master (DRTVWR-531) into DRTVWR-542-meshopt
2021-08-10 16:49:39 +03:00
c4c25c6853
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-08-10 13:53:07 +02:00
362946572f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-08-10 12:58:35 +02:00
9ac1a63a41
Merge branch 'master' into DRTVWR-530-maint
2021-08-10 06:43:59 +03:00
3f501ec2d0
Merge branch 'master' into DRTVWR-522-maint
2021-08-10 06:43:37 +03:00
12836d5f91
Merge remote-tracking branch 'origin/master' into DRTVWR-521-maint
2021-08-10 06:27:44 +03:00
ca4e15c930
Merge branch 'DRTVWR-531' of https://bitbucket.org/lindenlab/viewer
2021-08-09 14:27:13 +02:00
5776bd5410
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-09 11:10:17 +02:00
2251bbbce7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-08-02 09:28:56 +02:00
7c81cd821f
Linux FMOD Studio 2.02.02
2021-08-01 09:01:15 +02:00
81ae59fea5
Update FMOD Studio to 2.02.02 on Windows
2021-07-30 01:44:32 +02:00
497d4a5374
SL-15695 Updater installs 64 bit viewer instead of 32 bit on specific intel graphics device
2021-07-27 21:38:02 +03:00
9718a38e9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 03:07:48 +02:00
a242edc99d
Merge with Master after Viewer Release (also fixed some glaring automerge screw ups)
2021-07-19 17:43:19 -07:00
b8d846f0ed
Merge master (DRTVWR-516) into DRTVWR-542-meshopt
2021-07-20 00:58:09 +03:00
347a35540b
Update version meta info as well
2021-07-19 23:23:51 +02:00
8d03072b29
Updated Havok TPV lib
2021-07-19 23:20:14 +02:00
3a476a8296
Merge branch 'master' into DRTVWR-530-maint
2021-07-19 22:22:42 +03:00
238ce718a6
FIRE-31062: Rebuild KDU for macOS to allow running on older versions.
2021-07-15 22:28:06 -05:00
b758c75584
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-15 13:30:05 +02:00
8aab2b57dd
Linux/OSX FMOD Studio 2.02.01
2021-07-13 20:15:03 +02:00
006e1ff01d
FMOD Studio 2.02.01 for Windows
2021-07-13 14:13:25 +02:00
4372913f59
DRTVWR-542 updated 3p-meshoptimizer
...
Improved version detection 3p-meshoptimizer side
2021-07-12 22:24:27 +03:00
97c954dd84
SL-15522 Initial addition of meshoptimizer
2021-07-07 00:42:31 +03:00
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
Andrey Lihatskiy