summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Expand)Author
2023-05-19SL-18837: Merge branch 'xcode-14.1' of secondlife/viewer into xcode-14.3Nat Goodspeed
2023-01-03DRTVWR-575: Replace some LLSDArray() usage with llsd::array().Nat Goodspeed
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_...Nicky Dasmijn
2022-09-15Merge branch 'master' into DRTVWR-568Callum Linden
2022-08-26DRTVWR-568: Eliminate more blockers to C++17 language standard.Nat Goodspeed
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-06-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-...Nicky
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-05-01Remove setting of HEADER_FILE_ONLY on .h* files, cmake automaticallyNicky
2022-04-17Switch to target_include_directoriesNicky
2022-04-16Create a new target ll::oslibrary to link against libs specific to the OS com...Nicky
2022-04-06Move CMake files to modernized cmake syntax, step 1.Nicky
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
2022-02-28Initialize PODs with 0 and not leave anyting to chance.Nicky
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-01-14SL-16606: Add profiler category ENVIRONMENTPtolemy
2021-12-20SL-16297 Init mObscureMOAP flagMnikolenko Productengine
2021-12-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
2021-12-17SL-16297 Support the parcel obscure_moap flag.Mnikolenko Productengine
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-10-29Fix merge conflictPtolemy
2021-10-28SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTrac...Dave Parks
2021-10-27SL-16127: Make another pass removing redundant LLSD op [] calls, unused vars,...Ptolemy
2021-10-27Merged in SL-16127 (pull request #741)Michael Pohoreski
2021-10-21SL-16127: Replace slow getLightTransmittance with faster versionPtolemy
2021-10-19SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument LLSD...Dave Parks
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 18:32:35 +0000