Andrey Lihatskiy 0bffd3d365 Merge branch 'master' into DRTVWR-519 ... # Conflicts: # README.md		2021-11-16 01:21:05 +02:00
..
CMakeLists.txt	This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal	2021-03-09 14:39:51 -08:00
llavatarappearance.cpp	SL-14369 Get rid of static sSkeletonXMLTree	2020-11-30 20:19:54 +02:00
llavatarappearance.h	SL-14369 Get rid of static sSkeletonXMLTree	2020-11-30 20:19:54 +02:00
llavatarappearancedefines.cpp	Merge remote-tracking branch 'origin/master' into DRTVWR-517	2021-02-01 20:20:33 +00:00
llavatarappearancedefines.h	Merge remote-tracking branch 'origin/master' into DRTVWR-517	2021-02-01 20:20:33 +00:00
llavatarjoint.cpp	SL-14529 Replace dynamic_cast to LLAvatarJoint with static casts	2021-01-04 16:33:50 +02:00
llavatarjoint.h	…
llavatarjointmesh.cpp	…
llavatarjointmesh.h	…
lldriverparam.cpp	…
lldriverparam.h	…
lljointpickname.h	…
lllocaltextureobject.cpp	…
lllocaltextureobject.h	…
llpolymesh.cpp	…
llpolymesh.h	…
llpolymorph.cpp	…
llpolymorph.h	…
llpolyskeletaldistortion.cpp	…
llpolyskeletaldistortion.h	…
lltexglobalcolor.cpp	…
lltexglobalcolor.h	…
lltexlayer.cpp	This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal	2021-03-09 14:39:51 -08:00
lltexlayer.h	…
lltexlayerparams.cpp	…
lltexlayerparams.h	…
lltexturemanagerbridge.cpp	…
lltexturemanagerbridge.h	…
llviewervisualparam.cpp	SL-14303 Fix LLWearableType to not spam in logs	2020-11-10 18:18:51 +02:00
llviewervisualparam.h	…
llwearable.cpp	Merge branch 'master' into DRTVWR-521-maint	2021-02-01 22:14:44 +02:00
llwearable.h	…
llwearabledata.cpp	Merge branch 'master' into DRTVWR-521-maint	2021-02-01 22:14:44 +02:00
llwearabledata.h	…
llwearabletype.cpp	SL-14303 Fix LLWearableType to not spam in logs	2020-11-10 18:18:51 +02:00
llwearabletype.h	SL-14303 Wearable type label should contain translated intead of default string	2020-11-13 14:58:14 +02:00