summaryrefslogtreecommitdiff
path: root/autobuild.xml
AgeCommit message (Collapse)Author
2023-02-08Merge branch 'xcode-14.1' into DRTVWR-489-emojiKitty Barnett
2023-01-26DRTVWR-489-emoji: Pull in the updated version of GoogleMock that was updated ↵Callum Prentice
to Python3 so that it builds on macOS in TeamCity
2023-01-23DRTVWR-489-emoji: Pull in the updated ICU4C package that puts the libs and ↵Callum Linden
dlls in the right place for the Windows builds
2023-01-23DRTVWR-489-emoji: Pull in updated viewer-fonts package that includes ↵Callum Linden
'missing' Tweenmoji SVG font
2023-01-20DRTVWR-489-emoji: Pull in an updated version of 3p-icu4c that correctly ↵Callum Linden
copies over the Windows DLLs as part of the build process
2023-01-20Pull in (a) version of ICU4C - this one was built with VS 2019 and not VS ↵Callum Linden
2017 like everything else. The work to do this is large and we are switching soon to VS 2022 so this will do for now
2023-01-19DRTVWR-489-emoji: following kitty's recipe for emoji viewer - this pulls in ↵Callum Linden
3p library changes for steps 1-5 (boost, colladom, googlemock, nanosvg, viewer-fonts) - final 3p change (ICU4C) coming later
2022-12-12Merge branch 'main' into DRTVWR-489-emojiCallum Prentice
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-11-21Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
2022-11-21Merge branch master into DRTVWR-565-maint-PAndrey Kleshchev
2022-11-18SL-17135 Pull in apr-suit packageAndrey Kleshchev
Same apr suit version, but with debug symbols
2022-11-15SL-18618 Update libpngAndrey Kleshchev
2022-11-11SL-18603 update BugsplatMnikolenko Productengine
2022-11-09Pull in latest version of the fonts used in kitty catznip's emoji contributionCallum Linden
2022-11-09Merge branch 'DRTVWR-489-emoji' of https://bitbucket.org/lindenlab/viewer ↵Callum Linden
into DRTVWR-489-emoji
2022-11-09Add support for the 3p-nanosvg SVG library that will be used to rfender the ↵Callum Linden
emoji glyphs
2022-10-27SL-18230 - pull in updated 3p-freetype package for macOS/Darwin to build to ↵Callum Prentice
prevent linker errors in Viewer
2022-10-26SL-18468 - pull in the (new) 3P package containing the Viewer fonts that are ↵Callum Linden
required for Kitty's work
2022-10-26SL-18232 Library changes needed for emoji support from Kitty Barnett ↵Callum Linden
(updates for FreeType and ICU4C
2022-10-17SL-18218: Switch canonical_repo to GitHub URLBennett Goble
2022-10-14SL-18378 Update fmod studio to 2.02.09Andrey Kleshchev
Should fix some common crashes for parcel media
2022-10-06SL-18230: PUll in new version of FreeType that turns off zlib requirment to ↵Callum Linden
avoid linker dupe errors in the Viewer against zlib
2022-10-04SL-16542 Fixed openjpeg library's nameAndrey Kleshchev
2022-10-03DRTVWR-489: Update to freetype build 575484Nat Goodspeed
2022-10-03SL-16542 Fix mac build not having some of openjpeg headersAndrey Kleshchev
2022-10-01SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and ↵Andrey Kleshchev
enable partial bitstreams Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow. I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way. P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support
2022-09-16SL-18068: Update to viewer-manager build 575083Nat Goodspeed
2022-09-14SL-18151 [SEC] MOAP can force multiple floaters open on users screen: The ↵Callum Linden
Viewer part of the fix for this JIRA - pulls in the updated Dullahan that exposes the user_gesture/is_redirect flags and uses them to determine what type of 'nav_type' is exchanged with viewer/plugin
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 21:15:41 +0000