merge changes for CHOP-913

1 files changed, 18 insertions, 37 deletions

diff --git a/BuildParams b/BuildParams
index c929c2d90d..b91d3d2a80 100755
--- a/BuildParams
+++ b/BuildParams
@@ -26,50 +26,43 @@ codeticket_since = 3.3.0-release
 Linux.gcc_version = /usr/bin/gcc-4.6
 Linux.cxx_version = /usr/bin/g++-4.6
 
-# ========================================
-# Viewer Development
-# ========================================
+################################################################
+####      Examples of how to set the viewer_channel         ####
+#
+# To build a Release or Release candidate in build bingo:
+#    bingo.viewer_channel = "Second Life Release"
+#
+# To build a Beta for the 'Bingo' project in build bingo:
+#    bingo.viewer_channel = "Second Life Beta Bingo"
+#
+# To build a Project viewer for the 'Bingo' project in build bingo:
+#    bingo.viewer_channel = "Second Life Project Bingo"
+#
+# If left unset, viewer_channel defaults to 'Second Life Test',
+# which is appropriate for individual developer builds.
+#
+# All Linden Lab builds (and only Linden Lab builds)
+# should use a viewer_channel that begins with "Second Life"
+################################################################
 
 # Report changes since...
 viewer-development.show_changes_since = last_sprint
 
 # Build Settings
-viewer-development_coverity.coverity_product = viewer
-viewer-development_coverity.run_tests = false
 viewer-development.build_debug_release_separately = true
 
 # Notifications - to configure email notices, add a setting like this:
 # <username>_<reponame>.email = <email-address>
 
-
-# =================================================================
-# Canonical viewer integration builds - Oz Linden
-# =================================================================
-integration_viewer-development.viewer_channel = "Second Life Development"
-integration_viewer-development.login_channel = "Second Life Development"
-integration_viewer-development.build_viewer_update_version_manager = false
-integration_viewer-development.email = viewer-development-builds@lists.secondlife.com
-integration_viewer-development.build_enforce_coding_policy = false
-integration_viewer-development.codeticket_add_context = false
-
-viewer-beta.viewer_channel = "Second Life Beta Viewer"
-viewer-beta.login_channel = "Second Life Beta Viewer"
-viewer-beta.build_debug_release_separately = true
-viewer-beta.build_viewer_update_version_manager = true
-viewer-beta.codeticket_add_context = false
-
 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.codeticket_add_context = false
 
-
 # ========================================
 # mesh-development
 # ========================================
 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
@@ -79,7 +72,6 @@ mesh-development.build_viewer_update_version_manager = false
 # mesh-development-release-1-candidate
 # ========================================
 mesh-development-release-1-candidate.viewer_channel = "Project Viewer - Mesh"
-mesh-development-release-1-candidate.login_channel = "Project Viewer - Mesh"
 mesh-development-release-1-candidate.viewer_grid = agni
 mesh-development-release-1-candidate.build_debug_release_separately = true
 mesh-development-release-1-candidate.build_CYGWIN_Debug = false
@@ -89,7 +81,6 @@ mesh-development-release-1-candidate.build_viewer_update_version_manager = false
 # mesh-development-rc
 # ========================================
 mesh-development-rc.viewer_channel = "Project Viewer - Mesh"
-mesh-development-rc.login_channel = "Project Viewer - Mesh"
 mesh-development-rc.viewer_grid = agni
 mesh-development-rc.build_debug_release_separately = true
 mesh-development-rc.build_CYGWIN_Debug = false
@@ -99,7 +90,6 @@ mesh-development-rc.build_viewer_update_version_manager = false
 # mesh-asset-deprecation
 # ========================================
 mesh-asset-deprecation.viewer_channel = "Project Viewer - Mesh Asset Deprecation"
-mesh-asset-deprecation.login_channel = "Project Viewer - Mesh Asset Deprecation"
 mesh-asset-deprecation.viewer_grid = aditi
 mesh-asset-deprecation.build_debug_release_separately = true
 mesh-asset-deprecation.build_CYGWIN_Debug = false
@@ -117,7 +107,6 @@ viewer-mesh.build_viewer_update_version_manager = false
 viewer-mesh.build_Debug = false
 viewer-mesh.build_RelWithDebInfo = false
 viewer-mesh.viewer_channel = "Project Viewer - Mesh"
-viewer-mesh.login_channel = "Project Viewer - Mesh"
 viewer-mesh.viewer_grid = aditi
 viewer-mesh.email = shining@lists.lindenlab.com
 
@@ -126,7 +115,6 @@ viewer-mesh.email = shining@lists.lindenlab.com
 # ========================================
 
 viewer-pathfinding.viewer_channel = "Project Viewer - Pathfinding"
-viewer-pathfinding.login_channel = "Project Viewer - Pathfinding"
 viewer-pathfinding.viewer_grid = agni
 viewer-pathfinding.build_debug_release_separately = true
 viewer-pathfinding.build_CYGWIN_Debug = false
@@ -148,14 +136,12 @@ viewer-chui.build_viewer_update_version_manager = false
 # asset delivery 2010 projects
 # =================================================================
 viewer-asset-delivery.viewer_channel = "Second Life Development"
-viewer-asset-delivery.login_channel = "Second Life Development"
 viewer-asset-delivery.build_viewer_update_version_manager = false
 viewer-asset-delivery.email = monty@lindenlab.com
 viewer-asset-delivery.build_server = false
 viewer-asset-delivery.build_server_tests = false
 
 viewer-asset-delivery-metrics.viewer_channel = "Second Life Development"
-viewer-asset-delivery-metrics.login_channel = "Second Life Development"
 viewer-asset-delivery-metrics.build_viewer_update_version_manager = false
 viewer-asset-delivery-metrics.email = monty@lindenlab.com
 viewer-asset-delivery-metrics.build_server = false
@@ -172,34 +158,29 @@ simon_viewer-dev-private.email_status_this_is_os = false
 # Vir
 # ========================================
 vir-project-1.viewer_channel = "Second Life Release"
-vir-project-1.login_channel = "Second Life Release"
 
 # ========================================
 # THX-1138 / Runway projects
 # ========================================
 viewer-thx1138-runway-shared.viewer_channel = "Project Viewer - THX-1138 Runway"
-viewer-thx1138-runway-shared.login_channel = "Project Viewer - THX-1138 Runway"
 viewer-thx1138-runway-shared.viewer_grid = uma
 viewer-thx1138-runway-shared.build_debug_release_separately = true
 viewer-thx1138-runway-shared.build_CYGWIN_Debug = false
 viewer-thx1138-runway-shared.build_viewer_update_version_manager = false
 
 viewer-thx1138.viewer_channel = "Project Viewer - THX-1138"
-viewer-thx1138.login_channel = "Project Viewer - THX-1138"
 viewer-thx1138.viewer_grid = uma
 viewer-thx1138.build_debug_release_separately = true
 viewer-thx1138.build_CYGWIN_Debug = false
 viewer-thx1138.build_viewer_update_version_manager = false
 
 runway-merge.viewer_channel = "Project Viewer - Runway Merge"
-runway-merge.login_channel = "Project Viewer - Runway Merge"
 runway-merge.viewer_grid = agni
 runway-merge.build_debug_release_separately = true
 runway-merge.build_CYGWIN_Debug = false
 runway-merge.build_viewer_update_version_manager = false
 
 runway.viewer_channel = "Project Viewer - Runway"
-runway.login_channel = "Project Viewer - Runway"
 runway.viewer_grid = agni
 runway.build_debug_release_separately = true
 runway.build_CYGWIN_Debug = false