Merge from default branch

--HG--
branch : product-engine

1 files changed, 3 insertions, 124 deletions

diff --git a/BuildParams b/BuildParams
index 05cfb01b9f..95507ade0a 100644
--- a/BuildParams
+++ b/BuildParams
@@ -18,130 +18,6 @@ S3ACL = public-read
 # Update Public Inworld Build Status Indicators
 email_status_this_is_os = true
 
-####  P r o d u c t i o n  B u i l d s  ####
-
-# ========================================
-# Viewer Hotfix Old
-# ========================================
-
-# Report changes since...
-viewer-hotfix-old.show_changes_since = 2-1-release
-
-# Build Settings
-viewer-hotfix-old.build_viewer = true
-viewer-hotfix-old.build_server = false
-viewer-hotfix-old.build_server_tests = false
-viewer-hotfix-old.build_Linux = true
-viewer-hotfix-old.build_hg_bundle = true
-viewer-hotfix-old.build_docs = true
-#viewer-hotfix-old.build_Linux_Debug = false
-#viewer-hotfix-old.build_Linux_RelWithDebInfo = false
-#
-# Default channels etc - set build_viewer_update_version_manager to true when needed.
-viewer-hotfix-old.viewer_channel = "Second Life Release"
-viewer-hotfix-old.login_channel = "Second Life Release"
-viewer-hotfix-old.viewer_grid = agni
-viewer-hotfix-old.build_viewer_update_version_manager = false
-
-# ========================================
-# Viewer Hotfix Previous
-# ========================================
-
-# Report changes since...
-viewer-hotfix-previous.show_changes_since = 2-1-release
-
-# Build Settings
-viewer-hotfix-previous.build_viewer = true
-viewer-hotfix-previous.build_server = false
-viewer-hotfix-previous.build_server_tests = false
-viewer-hotfix-previous.build_Linux = true
-viewer-hotfix-previous.build_hg_bundle = true
-viewer-hotfix-previous.build_docs = true
-#viewer-hotfix-previous.build_Linux_Debug = false
-#viewer-hotfix-previous.build_Linux_RelWithDebInfo = false
-#
-# Default channels etc - set build_viewer_update_version_manager to true when needed.
-viewer-hotfix-previous.viewer_channel = "Second Life Release"
-viewer-hotfix-previous.login_channel = "Second Life Release"
-viewer-hotfix-previous.viewer_grid = agni
-viewer-hotfix-previous.build_viewer_update_version_manager = false
-
-# ========================================
-# Viewer Hotfix
-# ========================================
-
-# Report changes since...
-viewer-hotfix.show_changes_since = 2-1-release
-
-# Build Settings
-viewer-hotfix.build_viewer = true
-viewer-hotfix.build_server = false
-viewer-hotfix.build_server_tests = false
-viewer-hotfix.build_Linux = true
-viewer-hotfix.build_hg_bundle = true
-viewer-hotfix.build_docs = true
-#viewer-hotfix.build_Linux_Debug = false
-#viewer-hotfix.build_Linux_RelWithDebInfo = false
-#
-# Default channels etc - set build_viewer_update_version_manager to true when needed.
-viewer-hotfix.viewer_channel = "Second Life Release"
-viewer-hotfix.login_channel = "Second Life Release"
-viewer-hotfix.viewer_grid = agni
-viewer-hotfix.build_viewer_update_version_manager = false
-
-# ========================================
-# Viewer Release
-# ========================================
-
-# Report changes since...
-viewer-release.show_changes_since = 2-1-release
-
-# Build Settings
-viewer-release.build_viewer = true
-viewer-release.build_server = false
-viewer-release.build_server_tests = false
-viewer-release.build_Linux = true
-viewer-release.build_hg_bundle = true
-viewer-release.build_docs = true
-#viewer-release.build_Linux_Debug = false
-#viewer-release.build_Linux_RelWithDebInfo = false
-#
-# Default channels etc - set build_viewer_update_version_manager to true when needed.
-viewer-release.viewer_channel = "Second Life Beta Viewer"
-viewer-release.login_channel = "Second Life Beta Viewer"
-viewer-release.viewer_grid = agni
-viewer-release.build_viewer_update_version_manager = false
-
-# ========================================
-# Viewer Public
-# ========================================
-
-# Report changes since...
-viewer-public.show_changes_since = 2-1-release
-
-# Build Settings
-viewer-public.build_viewer = true
-viewer-public.build_server = false
-viewer-public.build_server_tests = false
-viewer-public.build_Linux = true
-viewer-public.build_hg_bundle = true
-viewer-public.build_docs = true
-#viewer-public.build_Linux_Debug = false
-#viewer-public.build_Linux_RelWithDebInfo = false
-#
-# Default channels etc - set build_viewer_update_version_manager to true when needed.
-viewer-public.viewer_channel = "Second Life Public Alpha"
-viewer-public.login_channel = "Second Life Public Alpha"
-viewer-public.viewer_grid = agni
-viewer-public.build_viewer_update_version_manager = false
-viewer-public_coverity.build_coverity = true
-viewer-public_coverity.coverity_product = viewer
-
-
-
-####  D e v e l o p m e n t  B u i l d s  ####
-
-
 # ========================================
 # Viewer Development
 # ========================================
@@ -181,6 +57,9 @@ viewer-development.build_viewer_update_version_manager = false
 # Notifications - to configure email notices, add a setting like this:
 # <username>_<reponame>.email = <email-address>
 
+# Snowstorm canonical build (oz)
+snowstorm_viewer-development.email = viewer-development-builds@lists.secondlife.com
+
 # =======================================
 # brad
 # ========================================