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
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
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
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
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
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
6c029e4858
DRTVWR-533 Updated LLCA to CT build 567162
2022-01-11 02:30:30 +02: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
83b4ea59fc
Merge branch 'SL-15742' into DRTVWR-527-maint
2021-12-16 00:58:44 +02:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +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
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
850767eb21
SL-16396 Updater fails with "takes exactly 3 arguments" error
2021-11-29 21:55:45 +02:00
98b416ff5c
SL-16396 Updater fails with "takes exactly 3 arguments" error
2021-11-23 22:56:05 +02:00
472509dff4
SL-16235 Update fmod to 2.02.03
2021-11-18 20:35:42 +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
a37a36c408
SL-16299 Updated dullahan to CT build 565428; entitlements cleanup
2021-11-04 01:10:46 +02:00
6921edcc39
SL-16293 Updated vlc to CT build 565299
2021-11-01 21:23:12 +02: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
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
adcd08fbf4
Revert "Merge branch 'c++17' into DRTVWR-522-maint"
...
This reverts commit 203ea3a70a8e3f077886
2021-09-28 19:22:18 +03: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
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
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
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
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
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
a242edc99d
Merge with Master after Viewer Release (also fixed some glaring automerge screw ups)
2021-07-19 17:43:19 -07:00
Nat Goodspeed