summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Expand)Author
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-09-28Revert "Merge branch 'c++17' into DRTVWR-522-maint"Andrey Lihatskiy
2021-08-27Merge branch 'c++17' into DRTVWR-522-maintAndrey Lihatskiy
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-19Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-06-29DRTVWR-538: Merge branch 'master' into c++17Nat Goodspeed
2021-06-25Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-06-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-05-07SL-15241: Tweak viewer sources to permit compiling on Mac with C++17.Nat Goodspeed
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and re...Callum Prentice
2021-03-09Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ...Brad Payne (Vir Linden)
2021-03-02Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-02-09SL-14797 Normalize right-click menus on Landmarks & Picks Part#3Andrey Kleshchev
2021-02-08Merge branch 'SL-14532' into DRTVWR-527-maintAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-02-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-01-13SL-14575 Pass validation flags into EEP validators.Andrey Kleshchev
2020-12-17SL-14570 - detailed breakdown of system folder issues in inventory validation...Brad Payne (Vir Linden)
2020-11-13Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
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-516-maintAndrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-09-24SL-13986 Validate uuidAndrey Kleshchev
2020-09-23SL-13986 Validate buffer size to avoid SIGBUS crash on sscanfAndrey Kleshchev
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