summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2013-03-13merge changes for latest viewer-developmentOz Linden
2013-01-08Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2013-01-08merge changes for DRTVWR-250Oz Linden
2013-01-04merge up to 3.4.4 betaOz Linden
2012-12-12Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-07Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to ↵Logan Dethrow
point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake.
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-27merge storm-1855 to latest viewer-developmentOz Linden
2012-11-26merge changes for DRTVWR-249Oz Linden
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-19MAINT-1841 Fix for mac/linux buildDave Parks
2012-11-19Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-11-19MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max ↵Dave Parks
performance Reviewed by Simon.
2012-11-16Fix Boost shared-library version suffixes in Copy3rdPartyLibs.cmake.Nat Goodspeed
2012-11-16Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-15Remove Boost version "1_45" baked into library names.Nat Goodspeed
On Windows, LLPrimitive.cmake named four Boost libraries with names ending in the string 1_45. Now that we're trying to upgrade Boost to 1.52, those suffixes are inappropriate. Fortunately the libraries in our current Boost package do not have version-stamped names, so we hope this fix can survive for several Boost upgrades to come.
2012-11-13Stupid typo in Boost Cmake filecallum_linden
2012-11-13Update Windows lib names for new Boost packagecallum_linden
2012-11-12First round of fixes to make viewer work with Boost 1.52callum_linden
2012-11-09make local developer builds use the same channel as TeamCity developer buildsOz Linden
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-07Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-11-07MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. ↵Dave Parks
Disable private memory pools. Make viewer large address aware on windows. Reviewed by Kelly
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
Two fairly simple conflicts: dead stats sending code in the texture fetch code (new llcorehttp library) and the cleanup code in llappviewer was moved around in 3.4.x.
2012-10-30pull back changes from 3.4.1-beta11Oz Linden
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-24pull back changes (enable tcmalloc) from 3.4.1-beta10Oz Linden
2012-10-22Enable tcmallocDave Parks
2012-10-20Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and ↵Don Kjer
CXXFLAG to have cmake generation debug symbols in xcode.
2012-10-18Removing -g flag from mac buildsDon Kjer
2012-10-17Adding '-g' to mac buildsDon Kjer
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20reapply 4a8388c13e56: MAINT-646 Enable /fp:fast in Visual StudioDave Parks
2012-09-12MAINT-1503 Minimal set of changes needed to safely disable tcmallocDave Parks
2012-09-12initial attempt to restore changes that make removing tcmalloc possible; not ↵Oz Linden
tested
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Cmake files not merged correctly and had to be done by hand. New memory allocation made some memory usage tests in the llcorehttp integration tests no longer valid. Would like to work on LLLog sometime and get it to be consistent. Special flags needed for windows build of example program.
2012-09-07Further attempts to erradicate TCMALLOCsimon@Simon-PC.lindenlab.com
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-31mergeDave Parks
2012-08-31MAINT-1503 Disable tcmalloc and fix remaining alignment issues.Dave Parks
2012-08-22merge changes for DRTVWR-202Oz Linden
2012-08-22Fix up white space to follow coding policy guidelinescallum_linden
2012-08-22merge changes for DRTVWR-203Oz Linden
2012-08-17Minor change required for merge from viewer-developmentAura Linden
2012-08-17Merged in from viewer-development.Aura Linden
2012-08-08More optional signing stuff for 10.5Aura Linden
2012-08-08Pulled merge, changed . to , in viewer-manifestAura Linden