Ansariel 546b276eba Fix merge issue		2015-01-18 17:18:23 +01:00
..
CMakeLists.txt	…
llavatarappearance.cpp	Fix merge issue	2015-01-18 17:18:23 +01:00
llavatarappearance.h	Fix merge issue	2015-01-18 17:18:23 +01:00
llavatarappearancedefines.cpp	…
llavatarappearancedefines.h	…
llavatarjoint.cpp	…
llavatarjoint.h	…
llavatarjointmesh.cpp	…
llavatarjointmesh.h	…
lldriverparam.cpp	Fix merge issue	2015-01-18 17:18:23 +01:00
lldriverparam.h	Fix merge issue	2015-01-18 17:18:23 +01:00
lljointpickname.h	…
lllocaltextureobject.cpp	…
lllocaltextureobject.h	…
llpolymesh.cpp	Backed out changeset: a3c260db5c4a - this is slow and needs to fixed differently (which is already done on our end says Nicky); thanks to Drake Arconis (Sovereign Engineer) for pointing out	2014-08-29 00:48:32 +02:00
llpolymesh.h	…
llpolymorph.cpp	Fix merge issue	2015-01-18 17:18:23 +01:00
llpolymorph.h	MAINT-4077: Refactoring to add copy constructors to the LLVisualParam class and all of its derived descendants in order to clarify ownership of memory pointers.	2014-05-23 21:56:44 +01:00
llpolyskeletaldistortion.cpp	Fix merge issue	2015-01-18 17:18:23 +01:00
llpolyskeletaldistortion.h	MAINT-4077: Refactoring to add copy constructors to the LLVisualParam class and all of its derived descendants in order to clarify ownership of memory pointers.	2014-05-23 21:56:44 +01:00
lltexglobalcolor.cpp	Fix merge issue	2015-01-18 17:18:23 +01:00
lltexglobalcolor.h	Fix merge issue	2015-01-18 17:18:23 +01:00
lltexlayer.cpp	Merge LL V3.7.9 (AIS3 + SSA)	2014-10-22 02:02:08 +02:00
lltexlayer.h	…
lltexlayerparams.cpp	Fix merge issue	2015-01-18 17:18:23 +01:00
lltexlayerparams.h	Fix merge issue	2015-01-18 17:18:23 +01:00
lltexturemanagerbridge.cpp	…
lltexturemanagerbridge.h	…
llviewervisualparam.cpp	Fix merge issue	2015-01-18 17:18:23 +01:00
llviewervisualparam.h	MAINT-4077: Refactoring to add copy constructors to the LLVisualParam class and all of its derived descendants in order to clarify ownership of memory pointers.	2014-05-23 21:56:44 +01:00
llwearable.cpp	Fix merge issue	2015-01-18 17:18:23 +01:00
llwearable.h	Fix merge issue	2015-01-18 17:18:23 +01:00
llwearabledata.cpp	Merge LL V3.7.9 (AIS3 + SSA)	2014-10-22 02:02:08 +02:00
llwearabledata.h	…
llwearabletype.cpp	…
llwearabletype.h	…