summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-21 09:31:49 -0400
committerOz Linden <oz@lindenlab.com>2011-03-21 09:31:49 -0400
commit9d2f08427b6f3643f642e3e599a19a2dce3101e7 (patch)
tree529ff1ed1ac9961ec86f76ec51a6e92e931a64f9 /BuildParams
parentdf63c6931e81c034887611711095e3134b9a7318 (diff)
parent819c7f0dd21b8b819cdc70686682e31cadf155d6 (diff)
pull updates to the start of 2.6.2 from viewer-development
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams20
1 files changed, 19 insertions, 1 deletions
diff --git a/BuildParams b/BuildParams
index 3684a3f641..00fa326ccd 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
# ========================================
@@ -157,6 +156,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 +194,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