summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Expand)Author
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-01Merge branch 'master' into DV525-merge-6.4.18Dave Houlton
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey 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-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-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-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-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-515-maintAndrey Lihatskiy
2020-09-22Add SQLite third package to this viewer and pull in the most recent build (3.33)Callum Prentice
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-22Merged master(DRTVWR-503) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey 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-27SL-13873 FIXED Mac SL viewer about box shows copyright 2019Mnikolenko ProductEngine
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-08-11Merged master into DRTVWR-482Andrey Kleshchev
2020-08-11Merged master into DRTVWR-514-keymappingsAndrey Kleshchev
2020-08-06Revert "SL-13082 Declare macOS SDK version to be 10.12 instead of 10.15"Andrey Lihatskiy
2020-07-22SL-13082 Declare macOS SDK version to be 10.12 instead of 10.15Andrey Lihatskiy
2020-07-21Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-07-20SL-13516 Move dupplicated functionality of evironment editors into separate c...Andrey Kleshchev
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
2020-06-23Backed out changeset: 19f3fa6e3e63andreykproductengine
2020-06-23SL-6109 Remade 'ignore' list processing, renamed and reformed keybindingsandreykproductengine
2020-06-23SL-6109 Better menu accelerator support and slight reorganizationandreykproductengine
2020-06-23SL-6109 Implemented LLDrawFrustumandreykproductengine
2020-06-23SL-6109 Small reorganisationandreykproductengine
2020-06-23SL-6109 Keyaboard support readyandreykproductengine
2020-06-11SL-13390 Disable Havok icon when Havok is not includedAndrey Kleshchev
2020-06-03More post-merge cleanupAndrey Lihatskiy
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
2020-06-02DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.Nat Goodspeed
2020-06-02Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy