summaryrefslogtreecommitdiff
path: root/autobuild.xml
AgeCommit message (Collapse)Author
2022-03-28SL-17079: Merge 'sl-17079' into DRTVWR-546 for Mac updater fix.Nat Goodspeed
2022-03-25SL-17079: Update to viewer-manager build 569958Nat Goodspeed
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # 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-02-15SL-16842, SL-14300: Merge branch 'DRTVWR-555' into DRTVWR-553-555Nat Goodspeed
2022-02-15SL-16842, SL-14300: Update to viewer-manager build 568552Nat Goodspeed
2022-02-11SL-16842: Merge 'DRTVWR-555' into DRTVWR-553-555 for updater fix.Nat Goodspeed
2022-02-11SL-16842: Update to viewer-manager build 568451Nat Goodspeed
2022-02-08SL-13792: Merge branch 'DRTVWR-555' into DRTVWR-553-555.Nat Goodspeed
This picks up the change to 32-bit Windows viewer-manager.
2022-02-08DRTVWR-555: Update to viewer-manager build 568310Nat Goodspeed
2022-02-08Merge branch 'DRTVWR-555' into DRTVWR-553+555Andrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llappviewer.cpp # indra/newview/viewer_manifest.py
2022-02-04SL-16788: Update to viewer-manager build 568156Nat Goodspeed
2022-02-04SL-16787 Updater launch issues.Andrey Kleshchev
2022-02-02SL-13792: Update to viewer-manager build 568036Nat Goodspeed
2022-02-01SL-13792: Update to viewer-manager build 568005Nat Goodspeed
2022-02-01SL-13792: Update to viewer-manager build 567997Nat Goodspeed
2022-01-31SL-13792: Use new Python 3 SLVersionChecker.Nat Goodspeed
On Mac, execute the packaged SLVersionChecker directly rather than invoking system Python on our manually-bundled scripts.
2022-01-13Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546Andrey Kleshchev
Final merge of DRTVWR-542 into DRTVWR-546, this only picks up a merge fix for updater.
2022-01-11DRTVWR-533 Updated LLCA to CT build 567162Andrey Lihatskiy
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2021-12-16Merge branch 'SL-15742' into DRTVWR-527-maintAndrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
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-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-01SL-16293 Updated vlc to CT build 565299Andrey Lihatskiy
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-03SL-15709: Add Darwin supportPtolemy
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-15 16:17:51 +0000