merging up latest mesh-development to nyx-mesh-development

1 files changed, 30 insertions, 13 deletions

diff --git a/BuildParams b/BuildParams
index ddb9294067..0a193803da 100755..100644
--- a/BuildParams
+++ b/BuildParams
@@ -11,6 +11,9 @@ Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2"
 # Use Public Upload Locations
 public_build = true
 
+# skip windows debug build until we can get a fix in.
+build_CYGWIN_Debug = false
+
 # Update Public Inworld Build Status Indicators
 email_status_this_is_os = false
 
@@ -66,12 +69,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-39
+#viewer-pre-release.release-viewer.jira = DRTVWR-13
+viewer-pre-release.release-viewer.jira = DRTVWR-46
+
 
 # =======================================
 # brad
 # ========================================
-
 debug-halting.email = cg@lindenlab.com
 debug-halting.build_server = false
 debug-halting.build_server_tests = false
@@ -95,6 +99,7 @@ mesh-development.viewer_channel = "Project Viewer - Mesh"
 mesh-development.login_channel = "Project Viewer - Mesh"
 mesh-development.viewer_grid = aditi
 mesh-development.build_debug_release_separately = true
+mesh-development.build_CYGWIN_Debug = false
 mesh-development.build_viewer_update_version_manager = false
 
 # ========================================
@@ -181,12 +186,13 @@ media.build_viewer_update_version_manager = false
 # oz
 # ================
 
-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
+oz_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
 
+
+oz_viewer-beta-review.build_debug_release_separately = true
 # ========================================
 # enus
 # ========================================
@@ -195,13 +201,6 @@ viewer-tut-teamcity.email = enus@lindenlab.com
 viewer-tut-teamcity.build_server = false
 viewer-tut-teamcity.build_server_tests = false
 
-# ========================================
-# experience
-# ========================================
-viewer-experience.public_build = false
-viewer-experience.viewer_channel = "Second Life SkyLight Viewer"
-viewer-experience.login_channel = "Second Life SkyLight Viewer"
-
 # =================================================================
 # asset delivery 2010 projects
 # =================================================================
@@ -219,5 +218,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