summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Expand)Author
2021-05-12SL-10297: Merge branch 'sl-10297-oz' into sl-10297.Nat Goodspeed
2021-05-06Merge branch master (DRTVWR-515) into DRTVWR-483Andrey Kleshchev
2021-05-06SL-15168 Viewer side functionality for guidebook window openingAndrey Kleshchev
2021-04-30Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge master (DRTVWR-515) into DRTVWR-516-maintAndrey Kleshchev
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-29Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-04-26SL-15170 remove mac_crash_loggerMnikolenko ProductEngine
2021-04-16SL-15028 Move guidebook code into own flaoterAndrey Kleshchev
2021-04-06Merge remote-tracking branch 'origin/master' into SL-14999Brad Payne (Vir Linden)
2021-04-01Merge branch 'master' into DRTVWR-519Callum Prentice
2021-04-01Merge branch 'master' into DV525-merge-6.4.18Dave Houlton
2021-04-01Merge branch 'master' (DRTVWR-514) into DRTVWR-518-uiAndrey Kleshchev
2021-04-01Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-23SL-14900 new Landmark creation flowMnikolenko Productengine
2021-03-17SL-14541 removed breakpad, win_crash_logger, updated zlibAndrey Kleshchev
2021-03-16SL-14999 - cppfeatures test file for examples and compiler conformance verifi...Brad Payne (Vir Linden)
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
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-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-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' v 6.4.15 into DRTVWR-525Dave Houlton
2021-03-02Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-01-16SL-14597 Pulled in updated uriparserAndrey Kleshchev
2021-01-14SL-14504 FIXED Classified links always launch your Profile ClassifiedsMnikolenko Productengine
2020-11-13Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-11-13Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-11-11Merge branch 'master' 6.4.12 into DRTVWR-510Dave Houlton
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-11Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-11-11Merged master (DRTVWR-507) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-10-15SL-13424 Add Rad Games Tools local Telemetry profiler supportPtolemy
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-14Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-10-06Remove SQLite from project and we are now not going to use it for the cacheCallum Prentice
2020-09-28Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy