phoenix-firestorm/indra/llinventory
Andrey Kleshchev 7c1cd47772 Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
# Conflicts:
#	indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
#	indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
..
tests SL-13669 tests should cover import/export category from llsd 2020-08-10 20:50:27 +03: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
llcategory.cpp
llcategory.h
llfoldertype.cpp SL-14570 - detailed breakdown of system folder issues in inventory validation. More info about expected state of system folders in llfoldertype 2020-12-17 15:23:04 +00:00
llfoldertype.h SL-14570 - detailed breakdown of system folder issues in inventory validation. More info about expected state of system folders in llfoldertype 2020-12-17 15:23:04 +00:00
llinventory.cpp SL-13669 tests should cover import/export category from llsd 2020-08-10 20:50:27 +03:00
llinventory.h Merge branch 'master' into DRTVWR-513-maint 2020-11-11 22:14:24 +02: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 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
lllandmark.cpp SL-13986 Validate uuid 2020-09-24 21:09:38 +03:00
lllandmark.h SL-13986 Validate buffer size to avoid SIGBUS crash on sscanf 2020-09-23 22:44:17 +03:00
llnotecard.cpp
llnotecard.h
llparcel.cpp Revert "Merge branch 'c++17' into DRTVWR-522-maint" 2021-09-28 19:22:18 +03:00
llparcel.h SL-14797 Normalize right-click menus on Landmarks & Picks Part#3 2021-02-09 01:59:15 +02:00
llparcelflags.h SL-14797 Normalize right-click menus on Landmarks & Picks Part#3 2021-02-09 01:59:15 +02: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
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-14575 Pass validation flags into EEP validators. 2021-01-13 20:47:20 +02:00
llsettingsbase.h SL-14575 Pass validation flags into EEP validators. 2021-01-13 20:47:20 +02:00
llsettingsdaycycle.cpp SL-14575 Pass validation flags into EEP validators. 2021-01-13 20:47:20 +02:00
llsettingsdaycycle.h Removed obsolete and misleading variable 2020-03-27 00:24:07 +02:00
llsettingssky.cpp SL-14575 Pass validation flags into EEP validators. 2021-01-13 20:47:20 +02:00
llsettingssky.h SL-11776 2019-08-22 11:19:04 -07:00
llsettingswater.cpp SL-14575 Pass validation flags into EEP validators. 2021-01-13 20:47:20 +02: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