# Conflicts: # .github/workflows/qatest.yaml # indra/newview/llfloatermodelpreview.cpp # indra/newview/llvoavatar.cpp # indra/newview/llwearableitemslist.cpp