phoenix-firestorm/indra/llinventory
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 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llcategory.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llfoldertype.cpp Creating settings objects in the correct folders. Correctly check if clouds paused. 2018-06-28 17:06:49 -07:00
llfoldertype.h MAINT-8011 make newly created Sky, Water, etc create a system folder with proper icon 2018-06-27 23:52:02 +01:00
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 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llinventorydefines.h Settings type inventory objects and upload the assests. 2018-03-06 14:58:39 -08:00
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 Merge 2018-09-26 13:46:45 -07:00
llinventorytype.h Merge 6.3.1 viewer-release 2019-08-26 12:35:18 -07:00
llinvtranslationbrdg.h Settings type inventory objects and upload the assests. 2018-03-06 14:58:39 -08:00
lllandmark.cpp remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lllandmark.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llnotecard.cpp remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llnotecard.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llparcel.cpp SL-9620 Viewer crashes after clicking "Commit" button while editing Day Cycle preset 2018-11-12 16:41:40 +02:00
llparcel.h SL-9661 Settings applied from inventory don't update about land floater. 2018-11-21 19:04:28 +02:00
llparcelflags.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
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 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
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 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lltransactionflags.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lltransactiontypes.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lluserrelations.cpp remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
lluserrelations.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00