livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llappearance
History
Ansariel a831237e29 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llimage/llimage.h
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreference.h
#	scripts/messages/message_template.msg.sha1
 		2024-02-06 17:58:20 +01: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 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-28 18:16:42 +02:00
llavatarappearance.h Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-06 17:58:20 +01:00
llavatarappearancedefines.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01:00
llavatarappearancedefines.h Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 19:05:20 +01:00
llavatarjoint.cpp SL-18893 Fixes for pull requests #38, #41, and #42 (#46) 2023-01-10 11:43:27 +02:00
llavatarjoint.h SL-333 WIP - added back some unused constructors to make the appearance utility happier 2016-02-12 15:40:46 -05:00
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 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 17:31:39 +01:00
lljointpickname.h
…
lllocaltextureobject.cpp Merge branch 'main' into marchcat/main-contrib-merge 2023-04-07 00:20:59 +03: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 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-06 17:58:20 +01:00
llpolymorph.h SL-20743 Use LLMutex in LLImageBase for internal data thread-safety 2023-12-21 19:12:52 +01:00
llpolyskeletaldistortion.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-03-01 12:54:24 +01:00
llpolyskeletaldistortion.h Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 17:31:39 +01:00
lltexglobalcolor.cpp Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01:00
lltexglobalcolor.h Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
lltexlayer.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-06 17:58:20 +01:00
lltexlayer.h Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-06 17:58:20 +01:00
lltexlayerparams.cpp Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-17 21:40:54 +02:00
lltexlayerparams.h Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer 2022-06-03 15:07:06 +02:00
llviewervisualparam.cpp Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-12 11:05:22 +01:00
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 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-12 11:05:22 +01:00
llwearabletype.h Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2020-12-09 13:14:39 +01:00