summaryrefslogtreecommitdiff
path: root/autobuild.xml
AgeCommit message (Collapse)Author
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-10-27SL-16235 Update fmod to 2.02.03Andrey Kleshchev
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-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-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-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-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
2021-04-01Updated llca to codeticket build 557744Andrey Lihatskiy
2021-03-17SL-14541 removed breakpad, win_crash_logger, updated zlibAndrey Kleshchev
2021-03-03Revert "Updated llca to codeticket build 556422"Andrey Lihatskiy
This reverts commit 4add069cae879a626c284ea13aeb1b42b3ca5dfc.
2021-03-03Pull in the newest Dullahan 1.10.x with CEF/Chromium 89.xCallum Prentice
2021-03-01Updated llca to codeticket build 556422Andrey Lihatskiy
2021-02-24Pull in new version of Dullahan with support for setting the host process ↵Callum Prentice
path, tweak viewer manifest so it copies the SwiftShader folder (required but may be a Chromium bug) and improve background color matching
2021-02-24SL-13788 Detecting Intel HD 400 as just Intel HDAndrey Kleshchev
CPU based detection in case Intel HD Graphics got detected
2021-02-23DRTVWR-520 Updated colladadom to codeticket build 556305Andrey Lihatskiy
2021-02-23DRTVWR-520 Updated googlemock to codeticket build 556304Andrey Lihatskiy
2021-02-23DRTVWR-520 Updated boost to codeticket build 556301Andrey Lihatskiy
2021-02-22First set of changes to make Dullahan build with CEF v88Callum Prentice
2021-02-18SL-13788 Some Intel gpus are recognized as just Intel HD GraphicsAndrey Kleshchev
2021-02-10DRTVWR-520 Updated dullahan to codeticket build 555904Andrey Lihatskiy
2021-02-10DRTVWR-520 Updated fmod to codeticket build 555883Andrey Lihatskiy
2021-02-10DRTVWR-520 Updated fmod to codeticket build 555876Andrey Lihatskiy
2021-02-02Updated LLCA to codeticket build 555615Andrey Lihatskiy
2021-02-01Merge branch 'master' into DRTVWR-514-keymappingsAndrey Kleshchev
# Conflicts: # indra/llui/llscrolllistctrl.cpp
2021-02-01Temporary revert "Updated LLCA to codeticket build 555537"Andrey Kleshchev
This reverts commit eac0f1857c6e8e89be649b60dcd8dca7573933df.
2021-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵Andrey Kleshchev
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069)
2021-02-01Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-02-01Updated LLCA to codeticket build 555537Andrey Lihatskiy
2021-02-01DRTVWR-520 Updated dullahan to codeticket build 555532Andrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-03 07:07:49 +0000