Commit Graph

268 Commits (ee2fce8790b69d61845cc32fbf7cdce8a33b0dab)

Author SHA1 Message Date
Oz Linden 2bcc75470d Override default channel from buildscripts project 2013-04-30 14:19:34 -04:00
Oz Linden 3bb708d706 merge up to latest viewer-development for merge to 3.5.2 2013-04-19 14:42:56 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Oz Linden 327c99cadb merge up to 3.5.2 development 2013-04-16 16:01:32 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Merov Linden 573ab07a40 Merge pull from lindenlab/viewer-beta 2013-01-10 14:51:59 -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 c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -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
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 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
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
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