summaryrefslogtreecommitdiff
path: root/autobuild.xml
AgeCommit message (Collapse)Author
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-27DRTVWR-543 post-merge cleanupAndrey Lihatskiy
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-05-21SL-17452 Fixed anscii usage dullahan sideAndrey Kleshchev
2022-04-20SL-17240 slvoice notarization fixAndrey Lihatskiy
2022-04-18Merge branch master (D540) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp
2022-04-18Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfloatersearch.cpp # indra/newview/llgroupactions.cpp # indra/newview/llvovolume.cpp
2022-04-18Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-04-15SL-17224 Update FMOD to version 2.02.06Andrey Kleshchev
2022-03-28SL-17079: Merge 'sl-17079' into DRTVWR-546 for Mac updater fix.Nat Goodspeed
2022-03-28SL-17079: Merge 'sl-17079' into DRTVWR-540-maint for updater fix.Nat Goodspeed
2022-03-25SL-17079: Update to viewer-manager build 569958Nat Goodspeed
2022-03-05SL-14541 Pull in updated colladaAndrey Kleshchev
2022-03-05SL-14541 Pull in updated zlib-ngAndrey Kleshchev
Nicky Dasmijn's contribution for zlib-ng Linux builds
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-03-01Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into ↵Andrey Lihatskiy
DRTVWR-543-maint # Conflicts: # autobuild.xml
2022-02-28Merge remote-tracking branch 'll/master'Nicky
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-02-28Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-02-28Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp
2022-02-18Bring back llappearance_utility.Nicky
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-11Spring cleaning, remove all traces of old 32 bit darwin/linux packages.Nicky
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-02-01DRTVWR-540 Updated LLCA to CT build 567974Andrey Lihatskiy
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
2022-01-06SL-13297 - Update autobuild.xml for new 3p-slvoice dependency following ↵Howard Stearns
commit message changes there.
2022-01-06SL-13297 - bad copypastaHoward Stearns
2022-01-06SL-13297 - Use new teamcity slvoice.Howard Stearns
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 13:23:15 +0000