summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Expand)Author
2021-12-15Merge remote-tracking branch 'origin/master' into brad/DRTVWR-550-mfaBrad Kittenbrink
2021-11-23SL-16388 Viewer MFA ImplementationBrad Kittenbrink
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
2021-11-04SL-16299 fix warning about CFBundleIdentifier not matching PRODUCT_BUNDLE_IDE...Brad Kittenbrink
2021-10-13Merge with master after latest Viewer releaseCallum Linden
2021-10-13Merge with head of Master after a new Viewer releaseCallum Prentice
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from i...Callum Prentice
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-06-25Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-06-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
2021-06-07Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-27SL-15211 Update OpenSSL libraryAndrey Kleshchev
2021-05-21Merge branch 'sl-10297' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-12SL-10297: Merge branch 'sl-10297-oz' into sl-10297.Nat Goodspeed
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-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-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-01-16SL-14597 Pulled in updated uriparserAndrey Kleshchev
2020-11-13Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy