phoenix-firestorm/indra/llappearance
Ansariel bfd99549b0 Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/pull_request_template.md
#	indra/llappearance/lltexlayer.cpp
#	indra/llcommon/llthread.cpp
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/lldaeloader.h
#	indra/llprimitive/llmodel.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llmodelpreview.cpp
#	indra/newview/lltoolpie.cpp
#	indra/newview/skins/default/xui/en/floater_model_preview.xml
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2025-07-18 14:14:54 +02:00
..
CMakeLists.txt #4147 Joint Overrides #3 2025-06-13 21:49:02 +03:00
llavatarappearance.cpp Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 2025-07-18 14:14:54 +02:00
llavatarappearance.h Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 2025-07-18 14:14:54 +02:00
llavatarappearancedefines.cpp
llavatarappearancedefines.h
llavatarjoint.cpp
llavatarjoint.h
llavatarjointmesh.cpp
llavatarjointmesh.h
lldriverparam.cpp
lldriverparam.h
lljointdata.h #4142 Joint grouping and stripping 2025-06-26 02:39:21 +03:00
lljointpickname.h
lllocaltextureobject.cpp
lllocaltextureobject.h
llpolymesh.cpp Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-12 19:31:51 +01:00
llpolymesh.h
llpolymorph.cpp Use standard library functions for llisnan and replace obvious NaN checks that don't work using /fp:fast floating point behavior under MSVC 2025-04-19 14:46:23 +02:00
llpolymorph.h
llpolyskeletaldistortion.cpp
llpolyskeletaldistortion.h
lltexglobalcolor.cpp
lltexglobalcolor.h
lltexlayer.cpp Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 2025-07-18 14:14:54 +02:00
lltexlayer.h
lltexlayerparams.cpp
lltexlayerparams.h
llviewervisualparam.cpp
llviewervisualparam.h
llwearable.cpp Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-27 19:36:45 +01:00
llwearable.h
llwearabledata.cpp
llwearabledata.h
llwearabletype.cpp
llwearabletype.h