Ansariel 684bc1d1ea Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/cmake/00-Common.cmake # indra/llcommon/llsys.cpp # indra/llwindow/llwindow.cpp # indra/llwindow/llwindow.h # indra/llwindow/llwindowmacosx.cpp # indra/llwindow/llwindowmacosx.h # indra/llwindow/llwindowwin32.cpp # indra/llwindow/llwindowwin32.h # indra/newview/app_settings/logcontrol.xml # indra/newview/llappviewerwin32.cpp # indra/newview/llpanelpeople.h # indra/newview/llspeakers.cpp # indra/newview/llviewerregion.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvocache.cpp # indra/newview/llvoicechannel.cpp # indra/newview/llvoicechannel.h # indra/newview/llvoiceclient.h # indra/newview/llvoicevivox.cpp # indra/newview/skins/default/xui/en/panel_preferences_sound.xml # indra/newview/viewer_manifest.py # scripts/messages/message_template.msg.sha1		2024-06-21 19:46:51 +02:00
..
avatar	#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed	2024-04-29 07:56:09 +03:00
deferred	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-06-21 19:46:51 +02:00
effects	#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed	2024-04-29 07:56:09 +03:00
environment	#1654 generate normals and tangents according to gltf specification (#1662)	2024-06-10 10:43:38 -05:00
gltf	#1718 Add GLTF support for multiple texcoords (#1720)	2024-06-11 17:10:13 -05:00
interface	1736 audit texture image unit usage on os x (#1739)	2024-06-14 17:06:07 -05:00
lighting	#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed	2024-04-29 07:56:09 +03:00
objects	Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev	2024-05-23 11:31:19 -07:00
post	Merge remote-tracking branch 'LL/marchcat/x-ws-merge'	2024-05-01 12:30:57 +02:00
windlight	Clean up line endings that got mangled up during last merge	2024-06-11 15:40:09 +02:00