diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
commit | 5a1b27ba5fbaaa9ee5528b1023a294bc899f7768 (patch) | |
tree | c641bd45e6384c85bff5e43ab01af5cad784283b /BuildParams | |
parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) | |
parent | 9693227cb41f909ef66f86e6699ad0bf124a7e83 (diff) |
merge out latest viewer-development
Diffstat (limited to 'BuildParams')
-rw-r--r-- | BuildParams | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/BuildParams b/BuildParams index 37080b41c8..547e851717 100644 --- a/BuildParams +++ b/BuildParams @@ -68,7 +68,6 @@ 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 - # ======================================= # brad # ======================================== @@ -156,7 +155,7 @@ media.build_viewer_update_version_manager = false # oz # ================ -oz_viewer-devreview.build_debug_release_separately = true +viewer-devreview.build_debug_release_separately = true oz-project-1.build_debug_release_separately = true oz-project-2.build_debug_release_separately = true oz-project-3.build_debug_release_separately = true @@ -193,5 +192,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 |