Skip to content
Snippets Groups Projects
Commit f9866a35 authored by Andrey Lihatskiy's avatar Andrey Lihatskiy
Browse files

Merge branch 'main' into DRTVWR-573-maint-R 

# Conflicts:
#	autobuild.xml
#	indra/newview/llagent.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmediasettingsgeneral.cpp
#	indra/newview/pipeline.cpp
parents a66ea0a9 a0c3d69c
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
Hide whitespace changes
Inline Side-by-side
Showing
with 102 additions and 256 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment