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
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
826ee26272
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-06-08 19:55:43 +02:00
050d28967a
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-06-08 18:57:04 +02:00
76f5e4f40a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-08 18:04:42 +02:00
d14ebd1f52
Updated llca to codeticket build 560271
2021-06-01 21:31:30 +03:00
b91561e982
SL-15211 Update OpenSSL library
2021-05-27 12:56:35 +03:00
2ea6f51200
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm
2021-05-25 09:11:03 +02:00
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
fcfaa2d735
Update OpenJPEG to 2.4.0 for Windows
2021-05-16 16:20:19 +02:00
9826ae6967
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-05-13 23:26:52 +02:00
a442f8b451
Revert "Merge branch 'DRTVWR-531' into DRTVWR-516-maint"
...
This reverts commit 07456abe928a33636e8f
2021-05-13 20:29:01 +03:00
b4817ef394
SL-15258: Update to colladadom without auto_ptr
2021-05-13 12:46:10 -04:00
cd3b20552c
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-05-11 21:09:19 +02:00
07456abe92
Merge branch 'DRTVWR-531' into DRTVWR-516-maint
2021-05-11 21:27:58 +03:00
ed78b2b938
SL-15234 Fix for linux build of 3p-uriparser by NickyD
...
Linux specific contibution. Should not affect win and darwin. Doesn't include linux build, just an update to ensure changes gets pulled into uriparser's master when viewer gets promoted and to make sure nothing complains about issues with 'head revision'.
2021-05-07 20:57:43 +03:00
d4f1140e60
FMOD Studio 2.01.09 for macOS.
2021-05-05 17:53:13 -05:00
d9183063a8
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-516
2021-05-04 19:37:12 +02:00
76b932e008
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-05-02 01:06:17 +02:00
d250798c6a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 00:53:38 +02:00
ec2d230323
Linux; Update open_libndofdev
2021-05-01 13:13:12 +02:00
1124ec1cd4
Linux; Updated uriparser
2021-05-01 12:17:34 +02:00
933b98880e
DRTVWR-520 Updated uriparser to codeticket build 559132
2021-05-01 02:14:54 +03:00
94534f4c88
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-30 23:25:06 +02:00
789be6b933
Merge branch 'master' into DRTVWR-520-apple-notarization
2021-04-30 03:05:19 +03:00
e41412edda
Merge remote-tracking branch 'origin/master' into DRTVWR-531
2021-04-29 13:41:02 -07:00
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
0405613511
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-24 22:38:49 +02:00
3623e6eb8a
DRTVWR-520 Updated dullahan to codeticket build 558653
2021-04-22 09:37:50 +03:00
ade99f8f6e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-22 07:18:44 +02:00
9080c818e0
DRTVWR-520 Updated apr_suite to codeticket build 558565
2021-04-21 07:04:53 +03:00
5d4ca2edfb
DRTVWR-520 Updated slvoice to codeticket build 558436
2021-04-21 07:01:01 +03:00
2de92430ef
Revert "SL-15141 Update CURL to 7.76.1" due to OPS-4251
...
This reverts commit 45b5ac72b2
2021-04-20 19:42:39 +03:00
af2fd21780
Linux; Update fmodstudio to 2.01.09.
2021-04-20 15:31:30 +02:00
45b5ac72b2
SL-15141 Update CURL to 7.76.1
...
CURLE_SSL_CACERT is now identical to CURLE_SSL_PEER_CERTIFICATE
2021-04-20 02:12:16 +03:00
e5be0b6ee1
FMOD update to 2.01.09 on Windows
2021-04-19 11:34:41 +02:00
4841acd297
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-17 22:44:52 +02:00
c9a9936edd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-16 23:01:15 +02:00
75f26d123d
Update to Chromium version 89.0.4389.114
2021-04-13 09:36:50 -07:00
fd19a25282
KDU 8.1 for macOS.
2021-04-03 10:20:57 -05:00
c890dd2b1e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-02 20:58:03 +02:00
db72dc7d0f
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-02 19:33:18 +02:00
d271062749
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-02 16:53:23 +02:00
2dbd5c5762
Pull in macOS version of CEF 89
2021-04-01 14:38:19 -07:00
930b8ed36e
Merge with ti of master after Viewer release
2021-04-01 14:35:28 -07:00
9fe758e8bc
Merge branch 'master' into DRTVWR-516-maint
2021-04-01 20:45:16 +03:00
6240168f24
Merge branch 'master' into DRTVWR-515-maint
2021-04-01 20:45:06 +03:00
3d9d0189e5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-01 19:41:03 +02:00
98f8912e25
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-01 16:49:55 +02:00
b6883636ff
Updated llca to codeticket build 557744
2021-04-01 12:42:59 +03:00
242a312159
Update tracy
2021-03-31 23:30:07 +02:00
d3ed0015f5
Windows; KDU 8.1
2021-03-28 14:10:09 +02:00
73bc62975e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-27 17:48:51 +01:00
8387c0e6cf
Linux; KDU update
2021-03-23 17:47:31 +01:00
af4e66d521
Add Tracy 3p to autobuild.xml
2021-03-22 01:06:53 +01:00
7e8aed44a6
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-03-17 18:47:16 +01:00
6b73a8331f
SL-14541 removed breakpad, win_crash_logger, updated zlib
2021-03-17 00:19:38 +02:00
493200bca5
Undo Linux updates.
2021-03-09 10:40:01 +01:00
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
3b7771756b
Revert "Updated llca to codeticket build 556422"
...
This reverts commit 4add069cae
2021-03-03 21:16:23 +02:00
b1add74c31
Pull in the newest Dullahan 1.10.x with CEF/Chromium 89.x
2021-03-03 10:09:27 -08:00
4add069cae
Updated llca to codeticket build 556422
2021-03-01 23:49:13 +02:00
2aea7cfc25
Pull in new version of Dullahan with support for setting the host process path, tweak viewer manifest so it copies the SwiftShader folder (required but may be a Chromium bug) and improve background color matching
2021-02-24 15:20:39 -08:00
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
5f4f0d2936
DRTVWR-520 Updated colladadom to codeticket build 556305
2021-02-23 23:59:11 +02:00
a0335671d5
DRTVWR-520 Updated googlemock to codeticket build 556304
2021-02-23 23:34:25 +02:00
c2660c152f
DRTVWR-520 Updated boost to codeticket build 556301
2021-02-23 23:07:54 +02:00
329d490036
First set of changes to make Dullahan build with CEF v88
2021-02-22 16:38:05 -08:00
748a53b8a7
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-18 19:33:48 +01:00
31bb38a6f3
SL-13788 Some Intel gpus are recognized as just Intel HD Graphics
2021-02-18 18:11:20 +02:00
4e3cd245e6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates
2021-02-15 17:46:45 +01:00
078b8b0e54
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 12:32:08 +01:00
098f79d7b6
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-15 11:42:22 +01:00
e4f0270887
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 11:41:48 +01:00
b4afa5f1b8
Update jemalloc.
2021-02-14 14:05:51 +01:00
d82b4b9540
FMOD Studio 2.01.08 for macOS.
2021-02-13 10:04:56 -06:00
e9e203412d
Linux; fmodstudio-2.01.08
2021-02-13 16:31:40 +01:00
69dee9509c
Update FMOD Studio to 2.01.08 on Windows
2021-02-12 16:04:33 +01:00
e320a463ac
DRTVWR-520 Updated dullahan to codeticket build 555904
2021-02-10 22:02:59 +02:00
fc166dabc0
DRTVWR-520 Updated fmod to codeticket build 555883
2021-02-10 15:59:04 +02:00
fd8eab7e61
DRTVWR-520 Updated fmod to codeticket build 555876
2021-02-10 13:14:28 +02:00
24b2f60d1a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates
2021-02-06 00:18:07 +01:00
2da7bc83b5
Updated LLCA to codeticket build 555615
2021-02-02 19:08:12 +02:00
5bc39cd87d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 17:50:49 +01:00
7ca874a6e3
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-02 00:16:25 +01:00
7458601374
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 00:05:53 +01:00
44b6459dfa
Merge branch 'master' into DRTVWR-514-keymappings
...
# Conflicts:
# indra/llui/llscrolllistctrl.cpp
2021-02-01 23:33:41 +02:00
7396a528c0
Temporary revert "Updated LLCA to codeticket build 555537"
...
This reverts commit eac0f1857c
2021-02-01 23:03:56 +02:00
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
d07f52da62
Merge branch 'master' into DRTVWR-520-apple-notarization
2021-02-01 22:11:44 +02:00
eac0f1857c
Updated LLCA to codeticket build 555537
2021-02-01 09:22:53 +02:00
1fd44923b5
DRTVWR-520 Updated dullahan to codeticket build 555532
2021-02-01 04:00:41 +02:00
cbee72276d
DRTVWR-520 Updated xmlrpc-epi to codeticket build 555529
2021-02-01 03:27:52 +02:00
63d9d378f4
DRTVWR-520 Updated 3p-libs to use signed versions
...
Updated apr-suite to codeticket build 555520
Updated curl to codeticket build 555526
Updated glod to codeticket build 555522
Updated expat to codeticket build 555519
Updated libhunspell to codeticket build 555528
Updated libndofdev to codeticket build 555523
Updated nghttp2 to codeticket build 555524
2021-02-01 03:14:11 +02:00
0e4faf7d9c
SL-12198 Pull in updated version checker
2021-01-26 01:03:00 +02:00
b61a998574
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-17 19:29:33 +01:00
1461e9bbb0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-01-17 19:24:26 +01:00
52b3bb404c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-01-17 12:38:03 +01:00
2f00eef6b4
SL-14597 Fixed mac library only including symlink
2021-01-16 13:16:12 +02:00
3d525fbf18
SL-14597 Pulled in updated uriparser
...
Due to crash inside uriparser's code
2021-01-16 01:06:16 +02:00
2ba8e979b0
It's 2021...
2021-01-03 23:35:35 +01:00
Andrey Lihatskiy