summaryrefslogtreecommitdiff
path: root/indra/CMakeLists.txt
AgeCommit message (Collapse)Author
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-10-13Merge with master after latest Viewer releaseCallum Linden
2021-10-14Merge branch master (DRTVWR-520) into DRTVWR-542-meshoptAndrey Kleshchev
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
# Conflicts: # autobuild.xml # build.sh # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp
2021-07-20Merge master (DRTVWR-516) into DRTVWR-542-meshoptAndrey Kleshchev
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-07SL-15522 Initial addition of meshoptimizerAndrey Kleshchev
2021-04-26SL-15170 remove mac_crash_loggerMnikolenko ProductEngine
2021-03-17SL-14541 removed breakpad, win_crash_logger, updated zlibAndrey Kleshchev
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ↵Callum Prentice
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-08-24SL-10297 merged 6.4.7Oz Linden
2020-03-25[DRTVWR-476] - fix linkingAnchor
2019-10-07do not build the old crash logger when using bugsplatOz Linden
2019-06-06remove the old crash logger modules when using BugSplatOz Linden
2019-03-02convert to an explicit USE_BUGSPLAT switch in cmake, revise LL_ERRS approachOz Linden
2019-03-19Better VS studio supportandreykproductengine
2018-09-07remove only-partially-successful attempt to put teamcity blocks around targetsOz Linden
2018-09-05add more block structure to TeamCity log output for componentsOz Linden
2017-07-10MAINT-4532: properly detect Windows 10 in the 64bit build (only - 32bit runs ↵Oz Linden
in Windows 8 compatibility mode)
2017-04-10MAINT-6928: Add in Python 2.6.6 modulesGlenn Glazer
2016-08-18SL-323: first pass at ripping out old updaterGlenn Glazer
2016-02-07merge changes for OPEN-292Oz Linden
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-02MAINT-5687: Remove old webkit from the make files and the repo. Ensure that ↵Rider Linden
it is no longer meaningfully referenced.
2015-07-10move doxygen generation to a subdirectoryOz Linden
2015-06-25merge buildcleanupOz Linden
2015-03-26Remove standlone media plugin and fb connect test apps while we transition ↵callum_linden
to CEF
2015-02-08OPEN-292 - Remove lscript from project,Cinder
Remove legacy udp script upload methods, Refactor script runtime perms from three arrays to one struct array so we don't have to juggle array order anymore.
2014-12-17Move the cmake package tracking files under the packages directoryOz Linden
2014-12-15Add feature (enabled) to turn off media pluginscallum_linden
2014-08-12Remove old linux_updater executable from source tree and CMake.Nat Goodspeed
2014-08-12Remove old Windows updater executable from source tree and CMake.Nat Goodspeed
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-02ACME-306 : Pull merge from viewer-chuiMerov Linden
2013-04-19merge up to latest viewer-development for merge to 3.5.2Oz Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-04-04merging in viewer-chuiGilbert Gonzales
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-02-21added llfbconnecttest thanks to callumCho
2013-02-14merge changes for 3.4.5Oz Linden
2013-01-17merge up to 3.4.4Oz Linden
2013-01-09MAINT-1481: remove linux-updater; move logic to Linux update_installNat Goodspeed
Now that the viewer's own background updater logic is responsible for downloading a new installer, the only functionality we still use in linux-updater that couldn't be expressed more simply in bash is the UI. But since most Linux distros capable of running SL at all have zenity, and all will have xmessage, we can handle even the UI part. Add xmenity wrapper script so update_install doesn't have to care which is present, and make the bash script that used to launch linux-updater do the real work.
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2013-03-06merge changes for DRTVWR-278Oz Linden
2013-03-05update minimum required version, and make it the same for all platformsOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 10:29:58 +0000