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 #3305 Don't crash on invalid texture index in getTEWearableType (#3306) 2024-12-18 14:00:11 -06:00
llavatarappearancedefines.h
…
llavatarjoint.cpp
…
llavatarjoint.h
…
llavatarjointmesh.cpp
…
llavatarjointmesh.h
…
lldriverparam.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
lldriverparam.h Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
lljointdata.h #4142 Joint grouping and stripping 2025-06-26 02:39:21 +03:00
lljointpickname.h
…
lllocaltextureobject.cpp
…
lllocaltextureobject.h Clean up boost includes and remove compiler warning pragma for unreachable code in PCH (#2361) 2024-08-20 18:41:48 +03:00
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 Merge branch 'develop' of https://github.com/secondlife/viewer 2024-08-23 13:47:48 +02:00
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 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
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 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
llwearabledata.h
…
llwearabletype.cpp
…
llwearabletype.h
…