summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-10-30pull back changes from 3.4.1-beta11Oz Linden
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-20Adding expanded searching for symbols during google breakpad symbol scanDon Kjer
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-12Fixing merge conflicts related to restoring DRTVWR-167 changesBrad Payne (Vir Linden)
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-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-22merge changes for DRTVWR-202Oz Linden
2012-08-22pull back release hotfix and beta fixesOz Linden
2012-08-21storm-1906: correct cmake error when using precompiled llphysicsextensions_tpvOz Linden
2012-08-17Merged in from viewer-development.Aura Linden
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-25Fix to build with code signing option (patch from STORM-1900)callum_linden
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-07-05partial changes for building with the llphysicsextensions source packageOz Linden
2012-07-05successful build with llphysicsextensions stubOz Linden
2012-08-01Merge back viewer-lion, which has viewer-development and down-stream fixessimon@Simon-PC.lindenlab.com
2012-07-20MAINT-570 Remove unused memory tracking system LLMemTypeDave Parks
2012-07-05begin integrating building of llphysicsextensions from source here (incomplete)Oz Linden
2012-06-27merge changes for DRTVWR-167Oz Linden
2012-06-26Renaming the rebake navmesh panel class.Todd Stinson
2012-06-26v-r to drano merge conflicts wipBrad Payne (Vir Linden)
2012-06-26Some clean-up after checking the differences between the pathfinding branch ↵Todd Stinson
and viewer-release.
2012-06-25PATH-743: Updating the cursors for path testing mode to final designs.Todd Stinson
2012-06-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-06-22mergeBrad Payne (Vir Linden)
2012-06-21PATH-743: Altering the mouse cursor to give more feed back when in path ↵Todd Stinson
testing mode.
2012-06-21merge changes for DRTVWR-168Oz Linden
2012-06-15Added dead_strip linker option to mac release build.Todd Stinson
2012-06-15MergeTodd Stinson
2012-06-15Hopefully fixing mac build issue.Todd Stinson
2012-06-15BUILDFIX: Correcting Windows build error.Todd Stinson
2012-06-15Hopefully this fixes the mac build.Matthew Breindel (Falcon)
2012-06-15Fixing build errorMatthew Breindel (Falcon)
2012-06-15MergeMatthew Breindel (Falcon)
2012-06-15Updating viewer build process to also generate a secondlife-bin.MAP file, ↵Matthew Breindel (Falcon)
tar it, and upload it.
2012-06-13WIP for path-702.prep
2012-06-11PATH-710: Removing the pathfinding basic floater and supporting class.Todd Stinson
2012-06-04merge changes for DRTVWR-157Oz Linden
2012-06-04mergeBrad Payne (Vir Linden)
2012-06-04mergeBrad Payne (Vir Linden)
2012-05-31merge changes for storm-276Oz Linden
2012-05-30First pass at refactoring the pathfinding linksets and pathfinding ↵Todd Stinson
characters classes to reduce code duplication, as both functionalities were heavily duplicated.
2012-05-31STORM-276 Match preferences look to that of the auto-replace functionality ↵Kitty Barnett
in STORM-1738