Skip to content
Snippets Groups Projects
Commit d19d8271 authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

Merge branch master (DRTVWR-483) into DRTVWR-559 

# Conflicts:
#	indra/newview/lllocalbitmaps.cpp
#	indra/newview/lllocalbitmaps.h
#	indra/newview/llviewerregion.cpp
#            lllocalgltfmaterials.* were modified to match lllocalbitmaps*
parents fbccc098 d31a83fb
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 594 additions and 99 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment