Ansariel 99e1699479 Merge branch 'release/2025.03' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llappearance/llwearable.cpp # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llviewerassetstorage.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewerwindow.cpp		2025-03-27 19:36:45 +01:00
..
class1	…
class2	…
class3	Disable shoreline fade. (#3811)	2025-03-26 10:28:01 -04:00
errorF.glsl	…
errorV.glsl	…