summaryrefslogtreecommitdiff
path: root/autobuild.xml
AgeCommit message (Collapse)Author
2021-12-15Merge branch master (DRTVWR-552) into DRTVWR-542-meshoptAndrey Kleshchev
+resolved viewer-manager's inherited conflict
2021-12-15updated viewer-manager after mergeAndrey Kleshchev
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-11Merge branch 'master' into SL-15742Bennett Goble
2021-12-10SL-15742: Convert build scripts to Python 3Bennett Goble
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-11-29SL-16396 Updater fails with "takes exactly 3 arguments" errorAndrey Kleshchev
2021-11-29Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546Andrey Kleshchev
2021-11-23SL-16396 Updater fails with "takes exactly 3 arguments" errorAndrey Kleshchev
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp
2021-11-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llagentwearables.cpp # indra/newview/llvoicevivox.cpp
2021-11-18SL-16235 Update fmod to 2.02.03Andrey Kleshchev
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch master (DRTVWR-545) into DRTVWR-542-meshoptAndrey Kleshchev
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-11-12SL-15333 Crash in glh_init_extensionsAndrey Kleshchev
2021-11-10SL-14403 Removed glodAndrey Kleshchev
2021-11-04SL-16299 Updated dullahan to CT build 565428; entitlements cleanupAndrey Lihatskiy
2021-11-02Manually resolving conflicts after merge with DRTVWR-520Andrey Kleshchev
This reverts commit 0a745b47880fb16b1db8cd3327377a383dbfe6a8.
2021-11-02Merge remote-tracking branch 'origin/master' into DRTVWR-540-maintAndrey Kleshchev
# 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-01SL-16293 Updated vlc to CT build 565299Andrey Lihatskiy
2021-10-27SL-16235 Update fmod to 2.02.03Andrey Kleshchev
2021-10-22Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/CMakeLists.txt # indra/llcommon/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewerwin32.h
2021-10-22DRTVWR-530 Updated uriparser to codeticket build 564957Andrey Lihatskiy
2021-10-22Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
2021-10-19Fix for SL-16208 Introduce a canonical_repo tag into the autobuild.xml file ↵Callum Prentice
for new 3p repos - no new code introduced in this pass
2021-10-13Merge branch 'master' v6.4.24 into DRTVWR-546Dave Houlton
2021-10-14Merge branch master (DRTVWR-520) into DRTVWR-542-meshoptAndrey Kleshchev
2021-10-13Merge with head of Master after a new Viewer releaseCallum Prentice
2021-10-14Merge branch 'master' into DRTVWR-545-maint-mixAndrey Lihatskiy
2021-09-28Revert "Merge branch 'c++17' into DRTVWR-522-maint"Andrey Lihatskiy
This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5. # Conflicts: # indra/newview/llmachineid.cpp
2021-09-23DRTVWR-520 Updated dullahan to codeticket build 563968Andrey Lihatskiy
2021-09-21Revert "DRTVWR-520 Updated dullahan to codeticket build 562751"Andrey Lihatskiy
This reverts commit adb724564da73a4b2d1ebf7835ce628448048d87.
2021-09-11SL-14541 Packages with fixed license labelAndrey Kleshchev
2021-09-09SL-14541 Package with fixed minizip-ng version recognitionAndrey Kleshchev
2021-09-08SL-14541 Replace zlib with zlib-ngAndrey Kleshchev
2021-09-03SL-15709: Add Darwin supportPtolemy
2021-09-03SL-15595 update viewer autobuild to import tracy libDave Houlton
2021-09-03Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mixAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp
2021-09-01DRTVWR-521 Updated llca to codeticket build 563493Andrey Lihatskiy
2021-08-30 SL-15900 Update the version of three.js we build against to latest before ↵Callum Prentice
pv release - I mssed up and commited a merge conflict which of course, broke everything - fixed now
2021-08-27SL-15900 Update the version of three.js we build against to latest before pv ↵Callum Prentice
release - fixed
2021-08-27Merge branch 'c++17' into DRTVWR-522-maintAndrey Lihatskiy
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-08-14SL-15588 Updated llphysicsextensions_tpv to codeticket version 562599Andrey Lihatskiy
2021-08-12DRTVWR-520 Updated dullahan to codeticket build 562751Andrey Lihatskiy
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
# 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-10Merge master (DRTVWR-531) into DRTVWR-542-meshoptAndrey Kleshchev
2021-08-10Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-08-10Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-04 19:55:53 +0000