Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer

Browse Source

# Conflicts:
#	indra/newview/llappearancemgr.cpp

master

Ansariel 2024-08-05 17:28:34 +02:00

parent 2bce31ded5 fcaf6ff829

commit 02b53eccbb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available