summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2014-08-29MergevilleGraham Linden
2014-08-05Merge to 3.7.14Graham Linden
2014-08-04Merge. Refresh from viewer-release after 3.7.13 release.Monty Brandenberg
2014-07-10merge changes for 3.7.12-releasemaksymsproductengine
2014-07-08Merge. Refresh from viewer-release after 3.7.11 release.Monty Brandenberg
2014-07-07Merge viewer up to 3.7.12, including fixing missed LL_WARNS etc from last ↵Graham Linden
release (is that trout you smell on the air? is it?)
2014-06-23Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseMonty Brandenberg
2014-06-23merge changes for 3.7.10-releaseOz Linden
2014-06-23viewer-release mergeChris Baker
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-16viewer-release mergeChris Baker
2014-06-16Merge. Refresh from viewer-release after 3.7.9 release.Monty Brandenberg
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-07Merge upstreamCinder
2014-06-05MergeRicky Curtice
2014-05-29Mergeup to 3.7.9 viewer-releaseGraham Linden
2014-05-22Merge. Pull in viewer-release after release of 3.7.8Monty Brandenberg
2014-05-19Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-14Begin syntax coloring personalizationCinder
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
2014-04-23merge changes for STORM-1831Oz Linden
2014-04-22merge changes for OPEN-199Oz Linden
2014-04-22Modify importer to (optionally) improve debug output, perform name-based LOD ↵Graham Linden
association, and handle models with many materials.
2014-04-18Begin moving script editor portions of LLTextEditor to their own derived class.Cinder
This should fix the run off segment bugs by not overriding LLTextBase::clearSegments() in LLTextEditor TODO: Move the rest of the script stuff out of LLTextEditor for simplicity sake
2014-04-15Linux/Win: Bad checksum on Windows package. Libz and libpng linking ↵Monty Brandenberg
changes to find newest code. Windows autobuild package had a bad checksum due to oddities in the build system. On Linux I've been fighting with getting libz 1.2.8 and libpng 1.6.8 to be the definitive version in the viewer. Problem is the *massive* library search tree we assemble. We find older shared library versions first and so those dominated. By using --whole-archive with static libraries, the packaged versions of these libraries are made definitive.
2014-04-08mergeBrad Payne (Vir Linden)
2014-04-08merge changes for 3.7.5-releaseOz Linden
2014-04-07merge with releaseRichard Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-04Library updates and switch to 3d-llqtwebkit2 build products.Monty Brandenberg
SDL to 1.2.15, c-ares to latest 1.10.0 build, Boost to 1.55.0 with coroutine updates/fixes, curl to 7.34.0, libpng to 1.6.8, openssl to 1.0.1e, zlib to latest 1.2.8 build, llqtwebkit built from 4.7.1 sources refactored and tested in 3p-llqtwebkit2 repository. Windows is functional with a good number of warning messages at runtime from libpng and KDU. MoaP/slplugin functioning.
2014-04-07Merge in viewer-release and version update to 3.7.6simon
2014-03-19OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBSOz Linden
2014-02-25ACME-1327 : WIP : Added big preview to the Flickr photo panel, uses the ↵Merov Linden
thumbnail for the moment
2014-02-25merge changes for 3.7.2-releaseOz Linden
2014-02-24Pulled from release.obscurestar
2014-02-12merge with releaseRichard Linden
2014-02-11mergeBrad Payne (Vir Linden)
2014-02-10Merge pull from lindenlab/viewer-releaseMerov Linden
2014-02-10Merge downstream code with viewer-releasesimon
2014-01-09ACME-1244 : WIP : Move files around and introduced an llimagefiltersmanager ↵Merov Linden
to get the filters
2014-01-07merge changes for 3.6.12-releaseOz Linden
2014-01-03merge changes for 3.6.12-releaseOz Linden
2013-12-21MAINT-3587 FIXED settings.xml still references avatarsunited.com for ↵maksymsproductengine
snapshot upload
2013-12-12Pull merge from lindenlab/viewer-releaseMerov Linden
2013-12-10mergeBrad Payne (Vir Linden)
2013-12-09Pulled viewer-releaseAura Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 09:32:25 +0000