Ansariel 40b731eb76 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 ... # Conflicts: # .gitignore # indra/cmake/FindOpenJPEG.cmake # indra/cmake/FreeType.cmake # indra/cmake/OpenJPEG.cmake # indra/cmake/UI.cmake # indra/cmake/ViewerMiscLibs.cmake # indra/llwindow/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py		2023-03-21 10:57:56 +01:00
..
CMakeLists.txt	…
llavatarappearance.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-10-21 12:34:53 +02:00
llavatarappearance.h	…
llavatarappearancedefines.cpp	…
llavatarappearancedefines.h	…
llavatarjoint.cpp	…
llavatarjoint.h	…
llavatarjointmesh.cpp	…
llavatarjointmesh.h	…
lldriverparam.cpp	…
lldriverparam.h	…
lljointpickname.h	…
lllocaltextureobject.cpp	Fix leak of tex layer objects during LLLocalTextureObject destruction	2022-10-19 22:16:39 -04:00
lllocaltextureobject.h	…
llpolymesh.cpp	Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer	2022-08-02 12:51:33 +02:00
llpolymesh.h	…
llpolymorph.cpp	Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer	2022-08-02 12:51:33 +02:00
llpolymorph.h	…
llpolyskeletaldistortion.cpp	…
llpolyskeletaldistortion.h	…
lltexglobalcolor.cpp	…
lltexglobalcolor.h	…
lltexlayer.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546	2022-05-27 11:41:45 +02:00
lltexlayer.h	…
lltexlayerparams.cpp	…
lltexlayerparams.h	…
lltexturemanagerbridge.cpp	…
lltexturemanagerbridge.h	…
llviewervisualparam.cpp	…
llviewervisualparam.h	…
llwearable.cpp	…
llwearable.h	…
llwearabledata.cpp	…
llwearabledata.h	…
llwearabletype.cpp	…
llwearabletype.h	…