phoenix-firestorm/indra/llappearance
Ansariel fc5a86a6cc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
2023-08-25 01:19:32 +02:00
..
CMakeLists.txt Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-30 14:53:12 +02:00
llavatarappearance.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-03-01 12:54:24 +01:00
llavatarappearance.h Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01:00
llavatarappearancedefines.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01: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 Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01:00
lldriverparam.h
lljointpickname.h
lllocaltextureobject.cpp Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-02-28 12:44:49 +01:00
lllocaltextureobject.h
llpolymesh.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01:00
llpolymesh.h
llpolymorph.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-03-01 12:54:24 +01:00
llpolymorph.h
llpolyskeletaldistortion.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-03-01 12:54:24 +01:00
llpolyskeletaldistortion.h
lltexglobalcolor.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01:00
lltexglobalcolor.h
lltexlayer.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01:00
lltexlayer.h
lltexlayerparams.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01:00
lltexlayerparams.h
llviewervisualparam.cpp
llviewervisualparam.h
llwearable.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01:00
llwearable.h Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-03-01 12:54:24 +01:00
llwearabledata.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-03-01 12:54:24 +01:00
llwearabledata.h Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-03-01 12:54:24 +01:00
llwearabletype.cpp
llwearabletype.h