summaryrefslogtreecommitdiff
path: root/autobuild.xml
AgeCommit message (Collapse)Author
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-11-29SL-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-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
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-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 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-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 branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-08-10Merge remote-tracking branch 'origin/master' into DRTVWR-521-maintAndrey Lihatskiy
2021-07-27SL-15695 Updater installs 64 bit viewer instead of 32 bit on specific intel ↵Andrey Kleshchev
graphics device
2021-07-19Merge with Master after Viewer Release (also fixed some glaring automerge ↵Callum Prentice
screw ups)
2021-06-21Fix for: SL-15433 Update version of CEF used in the Viewer to 91.0.4472.114Callum Prentice
2021-06-17Fix for: SL-15422 Update version of CEF used in the Viewer to 91.0.4472.101. ↵Callum Prentice
Also includes a tweak to viewer_manifest.py to handle some CEF file changes"
2021-06-01Updated llca to codeticket build 560271Andrey Lihatskiy
2021-05-27SL-15211 Update OpenSSL libraryAndrey Kleshchev
2021-05-18Pull in updated Dullahan and use it for for: Fix SL-14888 Media on a Prim ↵Callum Prentice
should not show JS (about to unload) popups
2021-05-13Revert "Merge branch 'DRTVWR-531' into DRTVWR-516-maint"Andrey Lihatskiy
This reverts commit 07456abe92ab24f373b238f6bd64087c078b7fc3, reversing changes made to 8a33636e8f56f8d1229b3f76ed6205ce8087048d.
2021-05-13SL-15258: Update to colladadom without auto_ptrNat Goodspeed
2021-05-11Merge branch 'DRTVWR-531' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-01DRTVWR-520 Updated uriparser to codeticket build 559132Andrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-04-29Merge remote-tracking branch 'origin/master' into DRTVWR-531Callum Prentice
2021-04-29Merge master (DRTVWR-515) into DRTVWR-516-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/llcoros.cpp # indra/llmessage/llcoproceduremanager.cpp # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/llfloaterimsessiontab.cpp
2021-04-22DRTVWR-520 Updated dullahan to codeticket build 558653Andrey Lihatskiy
2021-04-21DRTVWR-520 Updated apr_suite to codeticket build 558565Andrey Lihatskiy
2021-04-21DRTVWR-520 Updated slvoice to codeticket build 558436Andrey Lihatskiy
2021-04-20Revert "SL-15141 Update CURL to 7.76.1" due to OPS-4251Andrey Kleshchev
This reverts commit 45b5ac72b2384ea370e4138e08c4c8344d94b4e3 and updates curl links
2021-04-20SL-15141 Update CURL to 7.76.1Andrey Kleshchev
CURLE_SSL_CACERT is now identical to CURLE_SSL_PEER_CERTIFICATE
2021-04-13Update to Chromium version 89.0.4389.114Callum Prentice
2021-04-01Pull in macOS version of CEF 89Callum Prentice
2021-04-01Merge with ti of master after Viewer releaseCallum Prentice
2021-04-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 21:17:36 +0000