Andrey Lihatskiy 469ce7f7f6 Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK ... # Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp		2022-01-10 23:51:52 +02:00
..
tests	…
CMakeLists.txt	…
legacy_object_types.h	…
lldaeloader.cpp	SL-15102 Crash at load_face_from_dom_triangles	2021-04-13 00:40:00 +03:00
lldaeloader.h	SL-13698 Mac build fix	2020-08-11 20:43:50 +03:00
lllslconstants.h	…
llmaterial.cpp	SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.	2021-05-26 10:57:39 -06:00
llmaterial.h	SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.	2021-05-26 10:57:39 -06:00
llmaterialid.cpp	…
llmaterialid.h	…
llmaterialtable.cpp	SL-14960 Add checkbox to turn off collision sound.	2021-04-06 18:24:21 +03:00
llmaterialtable.h	SL-14960 Add checkbox to turn off collision sound.	2021-04-06 18:24:21 +03:00
llmediaentry.cpp	SL-2202 Add exception handling around boost::regex_match() calls in the viewer	2021-01-11 17:07:03 +02:00
llmediaentry.h	…
llmodel.cpp	SL-15183 Crash at LLModel::matchMaterialOrder	2021-04-29 00:11:25 +03:00
llmodel.h	…
llmodelloader.cpp	…
llmodelloader.h	…
llprimitive.cpp	SL-13599 Resolve gcc v10 'no trivial copy-assigment' warnings	2020-11-23 14:03:27 +02:00
llprimitive.h	SL-13599 Missing bounds checks in deserializer code	2020-10-19 21:46:56 +03:00
llprimlinkinfo.h	…
llprimtexturelist.cpp	…
llprimtexturelist.h	…
lltextureanim.cpp	…
lltextureanim.h	…
lltextureentry.cpp	…
lltextureentry.h	…
lltree_common.h	…
lltreeparams.cpp	…
lltreeparams.h	…
llvolumemessage.cpp	…
llvolumemessage.h	…
material_codes.cpp	…
material_codes.h	…
object_flags.h	…