Andrey Lihatskiy a2cb61d9f4 Merge branch 'master' into DRTVWR-507-maint ... # Conflicts: # indra/newview/pipeline.cpp		2020-09-28 22:08:48 +03:00
..
tests	SL-13669 tests should cover import/export category from llsd	2020-08-10 20:50:27 +03:00
CMakeLists.txt	Merge master (v 6.3.9) into DRTVWR-440	2020-03-18 15:39:38 -06:00
llcategory.cpp	…
llcategory.h	…
llfoldertype.cpp	…
llfoldertype.h	…
llinventory.cpp	SL-13669 tests should cover import/export category from llsd	2020-08-10 20:50:27 +03:00
llinventory.h	SL-13669 tests should cover import/export category from llsd	2020-08-10 20:50:27 +03:00
llinventorydefines.cpp	…
llinventorydefines.h	…
llinventorysettings.cpp	SL-12298 Convert LLSettingsType to an LLSINGLETON variant	2020-04-28 17:47:53 +03:00
llinventorysettings.h	SL-12298 Convert LLSettingsType to an LLSINGLETON variant	2020-04-28 17:47:53 +03:00
llinventorytype.cpp	…
llinventorytype.h	Merge 6.3.1 viewer-release	2019-08-26 12:35:18 -07:00
llinvtranslationbrdg.h	…
lllandmark.cpp	…
lllandmark.h	…
llnotecard.cpp	…
llnotecard.h	…
llparcel.cpp	…
llparcel.h	…
llparcelflags.h	…
llpermissions.cpp	SL-13669 Change inventory cache to use a standard LLSD format	2020-08-04 15:30:20 +03:00
llpermissions.h	SL-13669 Change inventory cache to use a standard LLSD format	2020-08-04 15:30:20 +03:00
llpermissionsflags.h	…
llsaleinfo.cpp	SL-13669 Change inventory cache to use a standard LLSD format	2020-08-04 15:30:20 +03:00
llsaleinfo.h	SL-13669 Change inventory cache to use a standard LLSD format	2020-08-04 15:30:20 +03:00
llsettingsbase.cpp	SL-12911 Add Debug setting EnvironmentPersistAcrossLogin	2020-03-27 00:24:08 +02:00
llsettingsbase.h	SL-12963 Additional environment debug output	2020-05-08 23:00:51 +03:00
llsettingsdaycycle.cpp	DRTVWR-476, SL-13467: Make LLTrace::BlockTimerStatHandle keys unique.	2020-06-19 12:33:15 -04:00
llsettingsdaycycle.h	Removed obsolete and misleading variable	2020-03-27 00:24:07 +02:00
llsettingssky.cpp	SL-12978 Add note about similar code in C++ and GLSL	2020-07-01 13:42:23 -07:00
llsettingssky.h	SL-11776	2019-08-22 11:19:04 -07:00
llsettingswater.cpp	SL-10181, SL-10546	2019-02-13 13:09:14 -08:00
llsettingswater.h	SL-10181, SL-10546	2019-02-13 13:09:14 -08:00
lltransactionflags.cpp	…
lltransactionflags.h	…
lltransactiontypes.h	…
lluserrelations.cpp	…
lluserrelations.h	…