summaryrefslogtreecommitdiff
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-24Increment viewer version to 7.1.7Nat Goodspeed
following promotion of secondlife/viewer #736
2024-04-24Merge release/maint-yz to main on promotion of secondlife/viewer #736: ↵Nat Goodspeed
Maintenance YZ 7.1.6.8745209917
2024-04-19viewer#1117 optimize one getIsCloud() awayAndrey Kleshchev
getIsCloud() is relatively expensive, especially for 'self', yet getRezzedStatus() already checks it and return 0, no need to repeat.
2024-04-19Revert "SL-20140 Setting shape hand size to 36 won't save"Andrey Lihatskiy
This reverts commit 810a3d24c2e3671f926091c062b101bdec6a1517. (secondlife/jira-archive-internal#70482)
2024-04-19Revert "SL-20140 Setting shape hand size to 36 won't save"Andrey Lihatskiy
This reverts commit 810a3d24c2e3671f926091c062b101bdec6a1517. (secondlife/jira-archive-internal#70482)
2024-04-16Merge pull request #1246 from secondlife/vir-linden-patch-2Vir Linden
https://github.com/secondlife/viewer/issues/1214 - Update cla.yaml
2024-04-16https://github.com/secondlife/viewer/issues/1214 - Update cla.yamlVir Linden
2024-04-15viewer#676 Use attacment info for rez state reportingAndrey Kleshchev
2024-04-15Merge pull request #1236 from secondlife/marchcat/yz-mergeAndrey Lihatskiy
Marchcat/yz merge
2024-04-15Merge branch 'main' into marchcat/yz-mergeAndrey Lihatskiy
2024-04-15CI: adopt xz compressionBennett Goble
Move towards packaging artifacts with xz, which offers higher compression ratios and faster decode time.
2024-04-15CI: Remove python-version from matrixBennett Goble
Drop python version from matrix configuration as it's always 3.11.
2024-04-15Remove unused fix-incredibuild.pyBennett Goble
2024-04-15Remove BuildParamsBennett Goble
This file is no longer used.
2024-04-15Merge branch 'main' into DRTVWR-600-maint-AAndrey Lihatskiy
2024-04-12Merge pull request #1198 from secondlife/signal/xzSignal Linden
CI: adopt xz compression, actions/*-artifact@v4
2024-04-11CI: adopt xz compressionBennett Goble
Move towards packaging artifacts with xz, which offers higher compression ratios and faster decode time.
2024-04-12Merge pull request #1204 from Ansariel/DRTVWR-600-maint-AAndrey Lihatskiy
Merge main into maint-A
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-11Merge pull request #1197 from secondlife/signal/rm-incredibuild.pySignal Linden
Remove unused fix-incredibuild.py
2024-04-11Merge pull request #1095 from secondlife/signal/rm-buildparamsSignal Linden
Remove BuildParams
2024-04-11Merge pull request #1199 from secondlife/signal/rm-py-matrixSignal Linden
CI: Remove python-version from matrix
2024-04-11CI: Remove python-version from matrixBennett Goble
Drop python version from matrix configuration as it's always 3.11.
2024-04-10Remove unused fix-incredibuild.pyBennett Goble
2024-04-10Merge pull request #1179 from secondlife/marchcat/y-mergeAndrey Lihatskiy
Release (Maint W) -> Maint YZ merge
2024-04-10Merge branch 'main' into marchcat/y-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp
2024-04-09Increment viewer version to 7.1.6Nat Goodspeed
following promotion of secondlife/viewer #690
2024-04-06Port from JsonCPP to Boost.Json for json parsing and serializing (#1054)Rye Mutt
2024-04-05SL-19585 Fix openal exit failure loggingAndrey Kleshchev
2024-04-04viewer#1117 Use attacment info for declouding logicAndrey Kleshchev
2024-04-04secondlife/viewer#984 BugSplat Crash: LLLoadedCallbackEntry::removeTexture(146)Alexander Gavriliuk
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-30Remove BuildParamsBennett Goble
This file is no longer used.
2024-03-28Remove dead googlemock dependency and related setup codeRye Mutt
2024-03-27Fix merge issuesAnsariel
2024-03-27Merge pull request #1062 from secondlife/marchcat/yz-mergeAndrey Lihatskiy
Merge main into maint YZ
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-26Increment viewer version to 7.1.5Nat Goodspeed
following promotion of secondlife/viewer #650
2024-03-26Merge GLTF PBR Maint 2 to main.Nat Goodspeed
2024-03-26secondlife/jira-archive-internal#69593 Avatar is upside down when viewed ↵Alexander Gavriliuk
from below
2024-03-24viewer#1033 Crash at syncFloaterTabOrderAndrey Kleshchev
2024-03-24Revert "SL-20416 Fix Crash Report 1409376 (update)"Andrey Kleshchev
This reverts commit cc43f42e6b7401c2cdd3204a16f757f5169bd95b.
2024-03-24viewer#951 Crash at LLScrollingPanelParam::drawAndrey Kleshchev
I'm not sure what causes this, but 1. Calling expensive getChild inside draw is not a good idea 2. I hope that simplified draw will capture a bit more info in bugsplat or will shift callctack elsewhere
2024-03-22Add Develop menu option 'Debug Camera Controls'Alexander Gavriliuk
2024-03-22viewer#888 Washed out letters in a running stringAndrey Kleshchev
2024-03-20viewer#1018 Crash at insertStringNoUndoAndrey Kleshchev
getEditableIndex retuns pos as is if only one segment is present