phoenix-firestorm/indra/llappearance
Andrey Lihatskiy 5217e6bfb7 Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
#	indra/cmake/CMakeLists.txt
#	indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-30 00:25:16 +03:00
..
CMakeLists.txt
llavatarappearance.cpp Merge branch 'main' into DRTVWR-577-maint-S 2023-02-09 22:33:52 +02:00
llavatarappearance.h SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llavatarappearancedefines.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llavatarappearancedefines.h
llavatarjoint.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llavatarjoint.h
llavatarjointmesh.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llavatarjointmesh.h
lldriverparam.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
lldriverparam.h
lljointpickname.h
lllocaltextureobject.cpp Merge branch 'main' into DRTVWR-577-maint-S 2023-02-09 22:33:52 +02:00
lllocaltextureobject.h
llpolymesh.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llpolymesh.h
llpolymorph.cpp SL-18893 OSX buildfix 2023-01-16 23:16:43 +02:00
llpolymorph.h
llpolyskeletaldistortion.cpp SL-18893 OSX buildfix 2023-01-16 23:16:43 +02:00
llpolyskeletaldistortion.h
lltexglobalcolor.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
lltexglobalcolor.h
lltexlayer.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
lltexlayer.h
lltexlayerparams.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
lltexlayerparams.h
lltexturemanagerbridge.cpp
lltexturemanagerbridge.h
llviewervisualparam.cpp
llviewervisualparam.h
llwearable.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llwearable.h
llwearabledata.cpp
llwearabledata.h
llwearabletype.cpp
llwearabletype.h