Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/newview/llfloater360capture.cpp		2022-12-12 22:09:54 +01:00
..
avatar	…
deferred	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-12-12 22:09:54 +01:00
effects	…
environment	…
interface	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2022-01-13 21:18:22 +01:00
lighting	SL-17451 Fix for erroneous attempt to apply vertex color alpha to texture before alpha masking (we don't actually support this and the vertex color alpha is sometimes zero when you think it ought not be).	2022-05-19 14:02:48 -05:00
objects	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2022-05-19 21:27:53 +02:00
post	…
transform	…
windlight	…