Commit Graph

111 Commits (e4819d9b22deebf080ca262a5a110a0ddfaee672)

Author SHA1 Message Date
Loren Shih 47781184fc Automated merge up from viewer-development into mesh-development 2011-04-04 10:42:52 -04:00
Loren Shih 8ccf3fbe3b Automated merge up from viewer-development into mesh-development 2011-03-31 16:40:57 -04:00
Oz Linden 635a4524fa pull tags from viewer-development 2011-03-31 15:50:34 -04:00
Dessie Linden 5c3ae68299 merged .hgtags from viewer-release 2011-03-30 17:46:51 -07:00
Dessie Linden b597bc02d7 Set release-viewer.jira value to DRTVWR-39 2011-03-24 12:51:25 -07:00
Loren Shih be553242ef Automated merge up from viewer-development into mesh-development 2011-03-21 10:38:39 -04:00
Oz Linden 9d2f08427b pull updates to the start of 2.6.2 from viewer-development 2011-03-21 09:31:49 -04:00
Oz Linden df63c6931e update build parameters for Oz builds 2011-03-21 08:48:04 -04:00
Oz Linden 5a1b27ba5f merge out latest viewer-development 2011-03-19 06:32:13 -04:00
Oz Linden 1a7369408c set build parameters for open dev projects 2011-03-18 20:59:10 -04:00
Oz Linden 6991eafce8 disable parallel linking in autobuild2010 2011-03-18 19:44:54 -04:00
Oz Linden c54d5353a6 add build name parameters 2011-03-18 12:46:16 -04:00
Oz Linden cd48598333 configure oz_viewer-autobuild2010 for separate debug builds on windows 2011-03-18 08:25:29 -04:00
Oz Linden 7e3c32308c merge out 2.6.0 changes from viewer-development 2011-03-18 08:08:12 -04:00
Merov Linden 741de388d3 Autobuild: pull in from jenn_linden/viewer-vs2010 2011-03-17 11:24:22 -07:00
brad kittenbrink 1ce22e11fd Removed trailing spaces that were breaking BuildParams parsing. 2011-03-17 12:49:30 -04:00
Oz Linden d27a695b0b remove unused configurations, modify my review build configuration 2011-03-17 12:25:28 -04:00
brad kittenbrink 4d11d30a3e Updated BuildParams in prep for vs2010 project viewer. 2011-03-16 19:29:14 -04:00
Loren Shih 037a83cd47 Automated merge up from viewer-development into mesh-development 2011-03-16 14:54:56 -04:00
Dessie Linden abffd7aa4f Added viewer-pre-beta parameters to BuildParams 2011-03-15 13:25:38 -07:00
Oz Linden 742dd75751 increment viewer version to 2.6.1 2011-03-15 16:14:07 -04:00
Loren Shih 13705596af Automated merge up from viewer-development into mesh-development 2011-03-14 12:03:14 -04:00
Oz Linden df633558e4 add parameters for pre-release repo 2011-03-10 16:42:07 -05:00
Alain Linden ba1d1267fe Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-03 13:56:43 -08:00
Alain Linden 8dffedb246 merge from lindenlab/viewer-development 2011-03-03 10:38:39 -08:00
Oz Linden 856a6992eb pull latest changes from viewer-vs2010 2011-03-03 07:50:40 -05:00
Jennifer Leech 0d93ce2e4a RelWithDebInfo build succeeded on TeamCity! Re-enabling Degug and Release builds. 2011-03-02 16:42:03 -08:00
Jennifer Leech c3efc900c6 Make temporary disabling of Debug/Release builds broadened to all builds regardless of name.
Need to increase iteration speed. Will revert when finished.
2011-03-02 14:40:31 -08:00
Jennifer Leech 6a10c803d3 Setting TMP env var to be used during builds. Possible collision when using VS2010 with system-wide TMP directory.
Also temporarily disabling Debug and Release builds to get a faster loop cyle on TC.
2011-03-01 14:26:24 -08:00
Oz Linden 76d67b1f78 adjust parameters for integration build 2011-02-17 18:46:04 -05:00
Oz Linden 7d16a19590 merge changes for viewer-autobuild 2011-02-17 13:52:53 -05:00
Oz Linden fb94ad7646 try disabling parallel builds in TC for Linux 2011-02-17 12:39:01 -05:00
Oz Linden cd885c0a09 Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010 2011-02-16 21:54:57 -05:00
Alain Linden 008938e372 turn off parallel linux builds; they don't work for autobuild driven builds. 2011-02-16 16:39:33 -08:00
Oz Linden 111e915a91 merge to latest viewer-development 2011-02-06 07:29:30 -05:00
Loren Shih fbc6e5d639 Automated merge up from viewer-development into mesh-development 2011-02-01 11:28:22 -05:00
David Kaprielian 3eba59e963 Adding run_tests buildparam and setting to false for coverity builds so coverity can run.
Reviewed by CG.
2011-01-26 15:07:54 -08:00
Andrew de Laix 9e5e15f0cb turn off parallel builds. 2011-01-22 00:12:30 +00:00
Loren Shih 4e98895719 Automated merge up from viewer-development 2010-12-21 10:39:35 -05:00
Monty Brandenberg db11a76d51 Merge from viewer-development post 2.4 release 2010-12-17 15:54:00 -05:00
Loren Shih ee0055f5af Automated merge up from viewer-development 2010-12-16 11:12:15 -05:00
Oz Linden 33f745b237 pulling fixes back from viewer-beta 2010-12-15 10:12:49 -05:00
Christian Goetze (CG) 4f798c40d8 Remove reference to then test codeticket service. 2010-12-14 15:32:32 -08:00
Loren Shih 618249155a Automated merge up from viewer-development 2010-12-13 10:08:55 -05:00
Monty Brandenberg 38476e3593 See if using a fully-qualified project name helps with the build. 2010-12-10 10:09:10 -05:00
Monty Brandenberg b9cf73c29b merge from http://hg.secondlife.com/viewer-development 2010-12-09 11:07:50 -05:00
Monroe Linden 1e050c2ed8 merge 2010-12-02 14:33:42 -08:00
Loren Shih bfd8efb057 Automated merge up from viewer-development 2010-12-01 10:55:24 -05:00
Christian Goetze (CG) 082443b88f re-activate new code ticket testing and limit the extent of code ticket loads to revisions after 2.2.0-release. 2010-11-27 12:37:25 -08:00
Christian Goetze (CG) 65b3cd14ca Turn off use of new codeticket for now... 2010-11-25 00:44:40 -08:00