diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:34:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:34:49 -0400 |
| commit | 51b75b883269a0a78a9428a690324c17abf028c1 (patch) | |
| tree | 56e131516119cf7c6fef2219ca8b8b454ceab0c0 /BuildParams | |
| parent | c4ec708922ad5d4a5844b90b8042a939a34733ac (diff) | |
| parent | df329d14a9b882f1bc9c2c598043569ca2688c03 (diff) | |
merge changes for storm-1108
Diffstat (limited to 'BuildParams')
| -rw-r--r-- | BuildParams | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/BuildParams b/BuildParams index 3684a3f641..8b96bf34bd 100644 --- a/BuildParams +++ b/BuildParams @@ -61,7 +61,6 @@ 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" @@ -156,7 +155,7 @@ media.build_viewer_update_version_manager = false # oz # ================ -oz-viewer-devreview.build_debug_release_separately = true +oz_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 |