summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Expand)Author
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ...Brad Payne (Vir Linden)
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-10-14SL-14119 Crash at LLVolumeFace::cacheOptimizeAndrey Kleshchev
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ll...Callum Prentice
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code change...Callum Prentice
2020-08-10SL-13669 tests should cover import/export category from llsdMnikolenko Productengine
2020-08-07SL-13669 updated testsMnikolenko Productengine
2020-08-04SL-13669 Change inventory cache to use a standard LLSD formatMnikolenko Productengine
2020-07-23Merge branch 'master' v6.4.6 into DRTVWR-497Dave Houlton
2020-07-21Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-07-01SL-12978 Add note about similar code in C++ and GLSLPtolemy
2020-06-29SL-13467 Make LLTrace::BlockTimerStatHandle keys uniqueAndrey Lihatskiy
2020-06-19DRTVWR-476, SL-13467: Make LLTrace::BlockTimerStatHandle keys unique.Nat Goodspeed
2020-05-08SL-12963 Additional environment debug outputAndrey Kleshchev
2020-04-28SL-12298 Convert LLSettingsType to an LLSINGLETON variantMnikolenko Productengine
2020-03-27SL-12911 Add Debug setting EnvironmentPersistAcrossLoginAndrey Kleshchev
2020-03-27Removed obsolete and misleading variableAndrey Kleshchev
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-02-24SL-12741 Moon was using fixed colorAndrey Kleshchev
2020-01-23SL-12591 Fixed float comparisonandreykproductengine
2019-12-19SL-11606 fix to match EEP light falloff vs releaseDave Houlton
2019-11-15SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. Gr...Brad Payne (Vir Linden)
2019-08-27SL-11055Graham Linden
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2019-08-26MergeRider Linden
2019-08-26SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.Rider Linden
2019-08-22SL-11776Graham Linden
2019-08-13SL-11212Graham Linden
2019-07-24SL-11600Graham Linden
2019-07-10SL-11541 WIPGraham Linden
2019-06-27SL-11151, SL-11504Graham Linden
2019-06-26SL-11151Graham Linden
2019-06-03MergeGraham Linden
2019-06-03SL-10966Graham Linden
2019-05-31SL-11117: Set default sky asset ID to A-12PMRider Linden
2019-05-29SL-10969Graham Linden
2019-05-21SL-11238Graham Linden
2019-05-16Revert lighting changes for 10856 causing knock-on.Graham Linden
2019-05-14MergeGraham Linden
2019-05-14Force file update.Graham Linden
2019-05-13SL-10856Graham Linden
2019-05-13SL-11150 FIXED [EEP] Settings names get truncated.maxim_productengine
2019-05-08SL-10878: Update default day cycle asset IDRider Linden
2019-05-07SL-11086Graham Linden
2019-05-03SL-11070Graham Linden
2019-05-03SL-11087, SL-11086, SL-11092Graham Linden