Commit Graph

318 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Todd Stinson f83fcc357f Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-05-25 18:44:47 -07:00
Todd Stinson 7f71798e01 Defaulting pathfinding project viewer to the agni grid. 2012-05-23 11:11:59 -07:00
Oz Linden 7637acf76e merge changes for DRTVWR-149 2012-05-22 06:03:42 -04:00
Kitty Barnett 1300f77fdd Merged with viewer-beta 2012-05-20 17:41:00 +02:00
Todd Stinson e6e51dfcc6 Adding a project viewer for the adult check build. 2012-05-10 15:25:55 -07:00
Oz Linden 95090c5d1e merge changes for version 3.3.1 2012-05-08 15:51:56 -04:00
Brad Payne (Vir Linden) 678864e4ed merge viewer-release to drano 2012-05-02 13:00:59 -04:00
Oz Linden 11bbd7e10e gratuitous change to force new codeticket number 2012-04-14 08:19:07 -04:00
Todd Stinson 999626e071 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development. 2012-03-09 10:38:24 -08:00
Oz Linden f712614d7b update build params for viewer release management builds 2012-03-08 21:07:59 -05:00
Richard Linden a0bb55adc6 merge with viewer-release 2012-04-26 14:39:52 -07:00
William Todd Stinson e96c6d054c Touching a file to get TC to build with the correct codeticket number on all platforms. 2012-04-11 21:17:45 -07:00
Todd Stinson 87257b24e4 Adding definitions for a project viewer for chui to more easily distinguish what is installed. 2012-04-11 16:47:16 -07:00
William Todd Stinson 18a8ff08e5 PATH-303: Adding build params for a project viewer. 2012-02-20 18:40:11 -08:00
Don Kjer d6098c7b41 Added build params for runway non-merge repo 2012-02-15 21:07:12 +00:00
Don Kjer 8efce456af Added build params for thx / runway projects 2012-02-15 21:03:00 +00:00
Oz Linden fd7ff1860b add oz to mail notices 2012-03-30 15:19:50 -04:00
Oz Linden a0ea7a5417 add parameters for Linden TeamCity build 2012-01-24 11:04:18 -05:00
Oz Linden 4c8d00d1d3 update build params for oz viewer-trial build 2011-12-19 15:25:39 -05:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
Oz Linden 6e2c76221e update build params 2011-11-21 09:28:39 -05:00
Dave Parks cfb666e9d9 merge 2011-11-15 17:04:37 -06:00
Brad Payne (Vir Linden) 1f17228145 merge 2011-10-18 16:24:23 -04:00
Oz Linden 77dc594e79 merge back late changes and tags from release branch 2011-10-17 16:19:57 -04:00
Debi King (Dessie) 1afbdc79c6 Attached ownership to viewer Beta and Release builds 2011-10-16 15:03:11 -04:00
Brad Payne (Vir Linden) f1e907ecbe merge 2011-10-11 13:38:19 -04:00
Oz Linden 32764f8b1d adjust parameters on Snowstorm team builds 2011-10-06 20:33:50 -04:00
Brad Payne (Vir Linden) 29401ee50a Fixes for installer, icon names to remove the 2 now that we are on version 3 2011-09-29 10:56:10 -04:00
Leslie Linden 78821c51a1 Merge from viewer-experience 2011-09-07 13:58:19 -07:00
Oz Linden 5bc9b401ed adjust build parameters for Snowstorm team builds 2011-08-22 09:06:00 -04:00
Oz Linden 49d1c9f05e update BuildParams for Snowstorm Team builds 2011-08-20 12:43:45 -04:00
Leyla Farazha 10ec004912 merge from viewer-experience 2011-08-12 14:53:25 -07:00
Oz Linden 1d0575bcc4 merge beta fix for storm-1060 2011-08-08 16:52:08 -04:00
Oz Linden f7e5282bad fix idiosyncratic name for beta viewer channel icon recognition 2011-08-08 16:49:06 -04:00
Oz Linden 0d085e90ac merge changes for storm-1060 2011-08-08 09:14:36 -04:00
Oz Linden d456006f9a remove override for channel testing 2011-08-05 16:23:31 -04:00
Oz Linden 0c2e949c6c change parameters to test build for release 2011-08-05 10:18:02 -04:00
Oz Linden e3114a8695 remove parameter used in test builds 2011-08-04 19:31:50 -04:00
Oz Linden 2fcf7bc6d7 storm-1060 (temporary) adjust build params for icon selection test 2011-08-04 09:01:36 -04:00
Brad Payne (Vir Linden) ca5bd96bb0 merge 2011-07-21 16:26:52 -04:00
Christian Goetze (CG) 299615e9d6 Re-enable public build status indicators 2011-07-20 11:48:19 -07:00
Brad Payne (Vir Linden) 0ddf718d92 still trying to fix channels 2011-07-20 13:48:46 -04:00
Brad Payne (Vir Linden) 7d8ec74213 Switching channels to project viewer 2011-07-20 11:30:55 -04:00
simon@lindenlab.com 1cf5ce3a43 Merge latest from viewer trunk 2011-07-07 17:46:18 -07:00
simon@lindenlab.com d40bd76ec7 Merge viewer 2.7.6 from trunk 2011-06-27 10:15:24 -07:00
Oz Linden 5d36b70aa6 merge changes for latest viewer-development 2011-06-26 07:32:22 -04:00
Oz Linden 13de92740e merge latest viewer-development 2011-06-22 11:45:43 -04:00
Oz Linden f657e8e16f remove error from build logs by taking out obsolete param (cg said this was ok to do) 2011-06-22 11:37:46 -04:00
Oz Linden c8232b6595 update codeticket configuration for my review builds 2011-06-22 11:36:52 -04:00
Oz Linden a5474e3398 remove a bunch of builds that are no longer needed 2011-06-22 11:30:18 -04:00
simon@lindenlab.com d11cabc489 Merge with latest lindenlab/viewer-development 2011-06-21 09:36:31 -07:00
Debi King (Dessie) fcf2ed5901 merged .hgtags & BuildParams 2011-06-21 11:47:58 -04:00
simon@lindenlab.com 9a02a4a1ea Merge with latest lindenlab/viewer-development 2011-06-16 13:15:30 -07:00
Brad Payne (Vir Linden) cc97e3d5ca merge 2011-06-14 10:14:44 -04:00
Debi King (Dessie) f766d2fac1 reconciled .hgtags 2011-06-13 14:18:54 -04:00
Oz Linden e35cc6f42b suppress codeticket tracking for ephemeral review repo 2011-06-13 08:25:01 -04:00
Dave SIMmONs 484a4733b7 Merge latest from lindenlab/viewer-development/ 2011-06-08 14:53:00 -07:00
Dave Parks f1784209d5 merge 2011-06-07 14:42:54 -05:00
Don Kjer 357062a196 Added build params for mesh-asset-deprecation 2011-06-03 19:46:34 +00:00
Oz Linden 8bfd3201de merge changes for latest viewer-development 2011-06-01 22:07:12 -04:00
Oz Linden 6bc63bddee merge changes for new search 2011-05-31 22:29:28 -04:00
Dave SIMmONs 3dfb4944ed Merge latest from lindenlab/viewer-development 2011-05-24 10:51:09 -07:00
Oz Linden 551d17f819 merge latest changes (post-2.7.0) from viewer-development 2011-05-23 11:38:33 -04:00
Oz Linden e8532721c3 correct channel names to include "Second Life" 2011-05-17 06:50:58 -04:00
Oz Linden 716bd22fbc Insert parameters for Search project viewer (replacing old Display Name viewer) 2011-05-16 15:46:43 -04:00
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05:00
Dave SIMmONs 00c5628074 Merge lindenlab/viewer-development 2011-05-12 13:42:51 -07:00
Oz Linden 353d2059fc merge up to latest viewer-development 2011-05-11 13:47:12 -04:00
Oz Linden 7610c0c050 change project viewer name from estate to region 2011-05-11 13:45:43 -04:00
Dave SIMmONs 11f988cd09 Change BuildParams to set public_build = false for this branch 2011-05-09 16:33:42 -07:00
Richard Linden 78d76eb4b0 Automated merge with bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.t3awyz\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_2xcevh.hg 2011-05-02 17:29:56 -07:00
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Oz Linden c3df5f5d67 merge up latest viewer-development 2011-04-22 18:25:57 -04:00
Dave Parks 764412f9b5 merge 2011-04-22 11:50:19 -05:00
Oz Linden b9c7d38370 merge changes for beta fixes 2011-04-22 11:52:02 -04:00
Oz Linden 06c4819b09 merge avatar physics fixes 2011-04-21 21:47:09 -04:00
Richard Linden a9aeeab6c5 removed skylight-specific build params 2011-04-21 18:36:07 -07:00
Dave Parks 62208046ae merge 2011-04-21 16:37:03 -05:00
Dave Parks 19857d0cf0 merge 2011-04-21 16:23:00 -05:00
Oz Linden 49ecf8efbc merge back fixes for STORM-1088 and (possibly) STORM-1141 2011-04-21 14:30:58 -04:00
Seraph Linden a50dab44d0 automated merge viewer-pre-release -> seraph-viewer-beta 2011-04-20 22:30:29 -04:00
Oz Linden eb15f9a8ce merge latest changes from windlight integration repo 2011-04-20 20:46:46 -04:00
Oz Linden 252cb50c38 merge changes for storm-1088 2011-04-20 20:21:55 -04:00
Dave Parks 5cf5e4bb88 merge 2011-04-19 16:35:37 -05:00
Oz Linden 302e0bc87e move windlight project build to a new TeamCity build 2011-04-19 16:35:06 -04:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
Debi King (Dessie) da7cd9f811 merged from 2.6.4-start tag in viewer-development 2011-04-18 10:07:40 -04:00
Oz Linden 796a94fc6e correct build parameters for Oz viewer beta review build 2011-04-17 09:07:01 -04:00
Debi King (Dessie) a1340acb3c Updated release-viewer.jira to DRTVWR-46 for v2.6.3 Release 2011-04-14 16:56:50 -04:00
Debi King (Dessie) e119b26f03 merged tip of viewer-beta at changeset 9de6fc07304f 2011-04-14 16:54:02 -04:00
Dave Parks 75b637d633 Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010 2011-04-14 13:24:31 -05:00
Dave Parks 6ec5e332fb Linux build should use 3p-google-perftools build result 2011-04-14 13:24:21 -05:00
Brad Payne (Vir Linden) 971b67bf87 disable windows debug builds (temporary) 2011-04-14 14:06:59 -04:00
Oz Linden 6bdfc3d048 merge out changes up to but not including the STORM-610 change 2011-04-13 12:03:53 -04:00
Oz Linden fd18b0cd7e adjust build params to make a windlight project viewer 2011-04-11 18:19:40 -04:00
Oz Linden 07a122c43c adjust build parameters for Oz projects 2011-04-08 21:29:52 -04:00
Oz Linden 5dea0bb37c merge changes for viewer-social-2 2011-04-08 17:36:13 -04:00
Oz Linden ed32a5e2b8 pull tags and late fixes back from viewer-pre-release 2011-04-08 09:24:58 -04:00
Oz Linden 444311d580 pull tags and late fixes back from viewer-pre-release 2011-04-08 09:24:07 -04:00
Debi King (Dessie) 746633c6ad Merged BuildParams 2011-04-07 22:35:27 -04:00
Debi King (Dessie) a22e3df7e5 Set release-viewer.jira to DRTVWR-44 for v2.6.2 2011-04-07 22:03:24 -04:00
Richard Linden 1d34e7b90b Automated merge with http://hg.secondlife.com/viewer-development 2011-04-06 15:20:51 -07:00
Oz Linden 94aa24a89e merge changes for social-859 2011-04-04 15:26:56 -04:00
Oz Linden 6e84133c98 merge changes for social-859 2011-04-04 15:32:00 -04:00
Loren Shih 47781184fc Automated merge up from viewer-development into mesh-development 2011-04-04 10:42:52 -04:00
Richard Linden 80efbeead1 merge 2011-04-01 18:23:13 -07: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 256ed564ac Set release-viewer.jira to DRTVWR-42 2011-03-31 12:40:30 -07:00
Dessie Linden 5c3ae68299 merged .hgtags from viewer-release 2011-03-30 17:46:51 -07:00
Richard Linden 84b179b0bf Automated merge with file:///F:\code\viewer-autobuild2010 2011-03-28 17:38:54 -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