summaryrefslogtreecommitdiff
path: root/autobuild.xml
AgeCommit message (Collapse)Author
2024-04-24Merge branch 'main' into marchcat/a-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llimage/llimage.cpp # indra/llui/llsearcheditor.cpp # indra/llui/llview.cpp # indra/newview/llagent.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloatercamera.cpp # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llinventoryfunctions.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpanelgroupbulkban.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llvovolume.cpp
2024-04-11Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
DRTVWR-600-maint-A # Conflicts: # indra/llcommon/llapp.cpp # indra/llcommon/llapp.h # indra/llimage/llimageworker.cpp # indra/llui/llcontainerview.cpp # indra/llui/llcontainerview.h # indra/llui/llkeywords.cpp # indra/llui/lltabcontainer.cpp # indra/llui/lltextbase.cpp # indra/newview/llappviewer.cpp # indra/newview/llfavoritesbar.cpp # indra/newview/llfavoritesbar.h # indra/newview/llfloaterimnearbychathandler.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llhudnametag.h # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelvoicedevicesettings.h # indra/newview/llpreviewscript.cpp # indra/newview/llpreviewscript.h # indra/newview/llselectmgr.cpp # indra/newview/lltranslate.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llviewermessage.cpp
2024-04-06Port from JsonCPP to Boost.Json for json parsing and serializing (#1054)Rye Mutt
2024-04-01Switch to 3p-boost repo built libsBennett Goble
2024-04-01Add boost 1.84.0, boost.jsonBennett Goble
Update boost from 1.81.0 (2022) to 1.84.0 (2023) and enable the `boost.json` module so that it can replace rapidjson.
2024-03-28Remove dead googlemock dependency and related setup codeRye Mutt
2024-03-27Fix merge issuesAnsariel
2024-03-27Merge branch 'main' into marchcat/yz-mergeAndrey Lihatskiy
2024-03-27Merge branch 'main' into DRTVWR-600-maint-AAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llfloaterchangeitemthumbnail.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llselectmgr.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llvovolume.cpp
2024-03-27Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml
2024-03-12Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
DRTVWR-600-maint-A # Conflicts: # autobuild.xml # indra/llrender/llfontbitmapcache.cpp # indra/llrender/llfontbitmapcache.h # indra/llrender/llfontfreetype.cpp # indra/llrender/llfontfreetype.h # indra/llrender/llfontgl.cpp # indra/llrender/llfontgl.h # indra/llui/llbutton.h # indra/llui/llfloater.cpp # indra/llui/llfloater.h # indra/llui/llfolderviewitem.cpp # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/llscrollcontainer.cpp # indra/llui/llscrollingpanellist.cpp # indra/llui/llscrollingpanellist.h # indra/llui/llscrolllistctrl.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llui/lluictrl.cpp # indra/llui/llview.cpp # indra/llui/llview.h # indra/newview/llchicletbar.h # indra/newview/llconversationlog.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterimsessiontab.h # indra/newview/llfloateruipreview.cpp # indra/newview/llnavigationbar.h # indra/newview/llpaneltopinfobar.h # indra/newview/llpathfindingpathtool.h # indra/newview/lltextureview.cpp # indra/newview/lltoolbrush.h # indra/newview/lltoolcomp.h # indra/newview/lltooldraganddrop.h # indra/newview/lltoolface.h # indra/newview/lltoolfocus.h # indra/newview/lltoolindividual.h # indra/newview/lltoolobjpicker.h # indra/newview/lltoolpie.h # indra/newview/lltoolpipette.h # indra/newview/lltoolselectland.h # indra/newview/llviewermediafocus.h # indra/newview/llviewerparcelmediaautoplay.h # indra/newview/llviewerwindow.cpp # indra/newview/llvoicechannel.h # indra/newview/llvoicevivox.h # indra/newview/llworldmapview.cpp
2024-03-01Merge remote-tracking branch 'origin/main' into release/gltf-maint2Brad Linden
2024-03-01Merge branch 'main' into marchcat/yz-mergeAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorygallery.cpp
2024-03-01Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2024-02-09SL-19585 Try replacing fmod with openalAndrey Kleshchev
Since now VLC is responsible for played parcel media (should be since SL-19042) should be possible to switch remaining audio to OpenAL with no loss of functionality
2024-02-02DRTVWR-594 Update llca to version 202402012004.0Andrey Lihatskiy
2024-02-01Issue #716 Update Fmod Studio to version 2.02.20Andrey Kleshchev
2024-01-19DRTVWR-601: Merge branch 'release/gltf-maint2' into DRTVWR-601-gha-libsNat Goodspeed
2024-01-16Undo re-ordering of autobuild.xml (#638)Ansariel Hiller
2024-01-10SL-20704 Fix for pathfinding debug display not working.RunitaiLinden
2023-12-20DRTVWR-601: Update xxhash common platform to GHA build.Nat Goodspeed
Remove identical platform-specific package references.
2023-12-18DRTVWR-601: Update mikktspace, tinygltf, tracy, vulkan_gltf, xxhashNat Goodspeed
to latest GitHub builds. Some of these were still referencing codeticket builds produced by TeamCity.
2023-12-18Merge branch 'main' into DRTVWR-594-maint-YAndrey Lihatskiy
2023-12-15DRTVWR-601: Update vulkan_gltf to GHA build.Nat Goodspeed
2023-12-15DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub.Nat Goodspeed
2023-12-15DRTVWR-601: Update mikktspace and tinygltf to GHA package builds.Nat Goodspeed
Ditch 32-bit Windows build of mikktspace.
2023-12-15Merge branch 'main' into DRTVWR-489Andrey Lihatskiy
# Conflicts: # indra/newview/fonts/DejaVu-license.txt # indra/newview/fonts/DejaVuSans-Bold.ttf # indra/newview/fonts/DejaVuSans-BoldOblique.ttf # indra/newview/fonts/DejaVuSans-Oblique.ttf # indra/newview/fonts/DejaVuSans.ttf # indra/newview/fonts/DejaVuSansMono.ttf
2023-12-14Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # indra/newview/llspatialpartition.cpp
2023-12-13DRTVWR-489 Restore autobuild.xml formatAndrey Lihatskiy
2023-12-12DRTVWR-489 Update freetype to v.2.12.1.557becdAndrey Lihatskiy
2023-12-05Fix formatting in autobuild.xml (indents in close tags)Alexander Gavriliuk
2023-12-05DRTVWR-587 Update llca to version 202312051404.0Andrey Lihatskiy
2023-12-05DRTVWR-587 Update llca to version 202312051404.0Andrey Lihatskiy
2023-12-05Merge branch 'main' into DRTVWR-489Alexander Gavriliuk
2023-11-30Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorygallery.cpp # indra/newview/skins/default/xui/en/notifications.xml
2023-11-29Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
2023-11-22DRTVWR-587: Update to viewer-manager v3.0-08bf5ee.Nat Goodspeed
This viewer-manager refactors the bad-graphics-card detection.
2023-11-22DRTVWR-594: Update kdu version from the updated package.Nat Goodspeed
2023-11-21DRTVWR-594: Update havok-source with havok-libs per recent PR.Nat Goodspeed
2023-11-21DRTVWR-594: Update kdu per recent PRNat Goodspeed
2023-11-21DRTVWR-594: Update dictionaries, glh_linear, havok-sourceNat Goodspeed
per recent PRs. Actually the havok-source update is for a new havok-llvm build.
2023-11-21SL-20591 Update viewer-manager to v3.0.0170afbAndrey Kleshchev
Restored removed commits since issue was isolated and bypassed. Original issue: win32util.py imports wmi, if import fails it uses registry for getting dns, if import works, it uses wmi to get dns. Including wmi broke dns for some of the users ([Errno 11001] Name or service not known)
2023-11-17SL-20591 Update viewer-manager to v3.0.73fef89Andrey Kleshchev
2023-11-10SL-20591 Update viewer-manager to v3.0.0395b15Andrey Lihatskiy
2023-11-06Revert "SL-20185 Fix connection issues (#490)"Andrey Kleshchev
Issue reproed again, restoring.
2023-11-03SL-20185 Fix connection issues (#490)akleshchev
2023-11-02DRTVWR-594 Update LLCA to v202311020117.0-0f5d9c3Andrey Lihatskiy
2023-10-31DRTVWR-587: Update viewer-manager to v3.0-074736e.Nat Goodspeed
This is viewer-manager's DRTVWR-587-actions branch updated from the new master branch.
2023-10-31SL-20031: Reintroduce newest viewer-manager build.Nat Goodspeed
2023-10-25Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 06:52:49 +0000