phoenix-firestorm/indra/llprimitive
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
..
tests
CMakeLists.txt
legacy_object_types.h
lldaeloader.cpp Merge branch 'master' (DRTVWR-557) into DRTVWR-546 2022-03-01 13:41:42 +02: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 Merge branch 'master' (DRTVWR-557) into DRTVWR-546 2022-03-01 13:41:42 +02:00
llmodel.h Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546 2021-11-29 20:33:13 +02:00
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