diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-04-05 10:36:41 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-04-05 10:36:41 -0700 |
| commit | 37c15d211b55d979ecea78237b22513ee663eb7a (patch) | |
| tree | 26fd8866ddc859ad7845d4da056b86ffbc5fdc71 /BuildParams | |
| parent | 5e486cf21bf8bcd4a40b44d024a19f8318e596bc (diff) | |
| parent | aeac73e45ec6210706dfaee959d8d798c6161c98 (diff) | |
Merge
Diffstat (limited to 'BuildParams')
| -rw-r--r-- | BuildParams | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/BuildParams b/BuildParams index 3684a3f641..9f962d45d3 100644 --- a/BuildParams +++ b/BuildParams @@ -61,14 +61,12 @@ viewer-release.viewer_channel = "Second Life Release" viewer-release.login_channel = "Second Life Release" viewer-release.build_debug_release_separately = true viewer-release.build_viewer_update_version_manager = true -viewer-release.release-viewer.jira = DRTVWR-13 viewer-pre-release.viewer_channel = "Second Life Release" viewer-pre-release.login_channel = "Second Life Release" viewer-pre-release.build_debug_release_separately = true viewer-pre-release.build_viewer_update_version_manager = true -#viewer-pre-release.release-viewer.jira = DRTVWR-13 - +viewer-pre-release.release-viewer.jira = DRTVWR-39 # ======================================= # brad # ======================================== @@ -157,6 +155,7 @@ media.build_viewer_update_version_manager = false # ================ oz-viewer-devreview.build_debug_release_separately = true +viewer-devreview.build_debug_release_separately = true oz_viewer-poreview.build_debug_release_separately = true oz-project-1.build_debug_release_separately = true oz-project-2.build_debug_release_separately = true @@ -194,5 +193,23 @@ viewer-asset-delivery-metrics.email = monty@lindenlab.com viewer-asset-delivery-metrics.build_server = false viewer-asset-delivery-metrics.build_server_tests = false +#============================================================================== +# autobuild viewers +#============================================================================== +viewer-autobuild2010.build_debug_release_separately = true +viewer-autobuild2010.viewer_channel = "Project Viewer - VS2010" +viewer-autobuild2010.login_channel = "Project Viewer - VS2010" +viewer-autobuild2010.viewer_grid = agni +viewer-autobuild2010.build_link_parallel = false + +#======================================== +# VS2010 +#======================================== +viewer-vs2010.viewer_channel = "Project Viewer - VS2010" +viewer-vs2010.login_channel = "Project Viewer - VS2010" +viewer-vs2010.viewer_grid = agni +viewer-vs2010.build_debug_release_separately = true +viewer-vs2010.build_viewer_update_version_manager = false +viewer-vs2010.build_link_parallel = false # eof |