Skip to content
Snippets Groups Projects
Commit 41d24952 authored by Mnikolenko Productengine's avatar Mnikolenko Productengine
Browse files

Merge branch 'main' into DRTVWR-539 

# Conflicts:
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/newview/llfloateravatarrendersettings.cpp
parents 561f5f57 c7053a69
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 141 additions and 77 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