Commit Graph

318 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
William Todd Stinson 74d3dc41fb Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-12-11 17:04:23 -08:00
Logan Dethrow 0302573348 Automated merge with ssh://bitbucket.org/lindenlab/viewer-development 2012-12-11 16:38:10 -05:00
Logan Dethrow b6a7c8fcfd Merge in backed out changes. 2012-12-07 17:50:37 -05:00
Logan Dethrow 954200e97f Backed out changeset 69636bceb5a2. 2012-12-07 17:48:50 -05:00
Logan Dethrow 77f58a7524 Backed out changeset 227671259809. 2012-12-07 17:48:10 -05:00
Logan Dethrow 8aa32015a9 Backed out changeset 5cf865a7afa7 2012-12-07 17:47:03 -05:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
William Todd Stinson 0011fb5e69 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-27 17:28:49 -08:00
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
William Todd Stinson a4945f36de Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-06 12:30:32 -08:00
William Todd Stinson b1035e2713 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-06 12:28:41 -08:00
William Todd Stinson 3b39ec165a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-02 17:56:35 -07:00
Oz Linden 02afdef369 merge back fixes from 3.4.1-beta12 2012-11-02 16:48:56 -04:00
Oz Linden dd55b600e5 whitespace change to force new build number 2012-11-02 14:58:09 -04:00
William Todd Stinson 333c53db92 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-01 10:49:50 -07:00
Oz Linden a7f02a3e51 merge changes for 3.5.0-beta2 2013-03-08 10:10:59 -05:00
Oz Linden 510c476468 clarify how to set viewer_channel for different build types 2013-02-20 15:52:37 -05:00
Oz Linden 5ea68c69a4 convert to new channel name scheme and remove login_channel build time parameter 2013-02-12 10:50:47 -05:00
William Todd Stinson be0406bffd Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-10-31 10:52:54 -07:00
Oz Linden 1a872c7bf8 pull back changes from 3.4.1-beta11 2012-10-30 14:34:05 -04:00
callum_linden 682d7355fd whitespace change to force new build in TC 2012-10-22 15:51:07 -07:00
callum_linden e18d97782f Turn off configs and tests for testingg 2012-10-19 16:45:40 -07:00
callum_linden 15cde616b9 Update to BuildParams var 2012-10-19 16:14:11 -07:00
callum_linden 2d7eb08852 Turn off cleaning up post build for testing 2012-10-19 12:13:18 -07:00
William Todd Stinson 4db36dfcdc Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-10-18 16:51:23 -07:00
William Todd Stinson abcdc25c29 Removing the adult check build configuration as it is no longer required. 2012-10-17 11:40:29 -07:00
Oz Linden 7021e4b21b change to force new build number 2012-10-16 16:07:25 -04:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
William Todd Stinson 42a50551b5 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development. 2012-09-14 16:25:54 -07:00
Don Kjer af3b020f54 Removed temporary debugging build params 2012-09-14 11:28:16 +00:00
Don Kjer 8808325ced Removed appearance utility from viewer source. Added appearance utility autobuild package. 2012-09-14 11:27:04 +00:00
Oz Linden a8aa7dbd8b inconsequential change to force new build 2012-09-10 13:44:14 -04:00
William Todd Stinson 9f10618f30 Setting up the project viewer for materials. 2012-08-29 19:48:20 -07:00
Todd Stinson 9488baada3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-09 12:06:09 -07:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Oz Linden 124f45d20e another change to force a new ticket, disable some codeticket features 2012-07-25 21:16:09 -04:00
Oz Linden 6059ac5f6c clean up BuildParams and change to force a new ticket 2012-07-25 18:22:48 -04:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
Oz Linden 4e56af04ef remove now-unused build parameters (moved to TeamCity configuration) 2012-06-26 16:55:01 -04:00
Todd Stinson 6e710333e7 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-06-22 18:59:31 -07:00
Oz Linden 4397516ca5 merge changes for DRTVWR-168 2012-06-21 17:50:41 -04:00
Oz Linden f64a79d9d1 merge changes for DRTVWR-171 2012-06-21 14:19:25 -04:00
Merov Linden bc54f1bb89 Merge : pull from lindenlab/viewer-release 2012-06-07 22:30:54 -07:00
Oz Linden 5cad51594d fix DOS line endings 2012-05-31 14:11:46 -04:00
Kitty Barnett e4c54afec2 Merged with viewer-release 2012-05-30 22:09:17 +02:00
Todd Stinson 5d13d78c13 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-05-30 11:41:08 -07:00
Todd Stinson 02adf10a9e Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-05-29 19:16:10 -07:00
Oz Linden 4cffd32f90 merge back change to force ticket number from viewer-release 2012-05-29 13:31:06 -04:00
Oz Linden a519e34f02 inconsequential change to force new ticket number 2012-05-28 09:23:24 -04:00
Todd Stinson b8bc62a514 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-05-25 18:45:27 -07:00
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