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-24Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
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-20viewer#1290 Fix missing variable reinitializationsAndrey Kleshchev
2024-04-19Update build.yamlVir Linden
2024-04-19viewer#1290 Fix snapToMessageHeight crashAndrey Kleshchev
2024-04-19https://github.com/secondlife/viewer/issues/1286 - branch var from ↵Vir Linden
github.repository
2024-04-19https://github.com/secondlife/viewer/issues/1286 - branch var from ↵Vir Linden
github.repository
2024-04-19https://github.com/secondlife/viewer/issues/1286 - determine viewer_channel ↵Vir Linden
from branch name in builds
2024-04-19secondlife/viewer#1249 Erratic Emoji Picker BehaviorAlexander Gavriliuk
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-17viewer#1143 Crash at LLReflectionMap::autoAdjustOrigin #2Andrey Kleshchev
2024-04-17Fix typo in settings names (#1257)Ansariel Hiller
2024-04-16Merge pull request #1224 from nerodevo/autobuild-revertAndrey Lihatskiy
Revert removal of llphysicsextension_stub for Windows
2024-04-16Merge branch 'main' into autobuild-revertnat-goodspeed
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-16Change windows to windows64 againnerodevo
Missed the second change... Here it is.
2024-04-16Change windows to windows64nerodevo
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-15Revert "SL-20140 Setting shape hand size to 36 won't save"Andrey Lihatskiy
This reverts commit 810a3d24c2e3671f926091c062b101bdec6a1517. (secondlife/jira-archive-internal#70482)
2024-04-15Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
2024-04-13Revert "DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub."nerodevo
This reverts commit d07cd115e3bdef8a2b1d2f6a5a507ddb67ff8cd9.
2024-04-12Merge pull request #1198 from secondlife/signal/xzSignal Linden
CI: adopt xz compression, actions/*-artifact@v4
2024-04-12Merge pull request #1211 from secondlife/marchcat/x-mergeAndrey Lihatskiy
Release (Maint W) -> Maint X merge
2024-04-12viewer-private#226 Unhandled PngError throws application into a loopAndrey Kleshchev
png_read_info triggered a PngError, LLAppViewer::frame() handled it instead of LLPngWrapper::readPng, and since status didn't change viewer tried to decode image again and again and again.
2024-04-12Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
# Conflicts: # indra/llimage/llimageworker.cpp # indra/llimage/llimageworker.h # indra/newview/llcontrolavatar.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/lltexturefetch.cpp
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-10Fix BUG-225288: Detaching stops unrelated animationsSalad Dais
This is to do with misunderstandings related to how .find() works with multimaps. .find() will, in fact, return an iterator to the first iterator it finds, and will iterate through all elements in the multimap when incremented, not just items with the same key. Change code working with animation sources to be aware of this fact, so unrelated animation sources do not have their animations stopped.
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-06 12:59:49 +0000