1 files changed, 8 insertions, 32 deletions
diff --git a/BuildParams b/BuildParams
index 7a6542dadc..3e04d1ce29 100755
--- a/BuildParams
+++ b/BuildParams
@@ -55,21 +55,9 @@ Amazon_viewer_channel_suffix = "Amazon"
 Desura_sourceid = "1208_desura"
 Desura_viewer_channel_suffix = "Desura"
 
-# Report changes since...
-viewer-development.show_changes_since = last_sprint
-
-# Build Settings
-viewer-development.build_debug_release_separately = true
-
 # Notifications - to configure email notices, add a setting like this:
 # <username>_<reponame>.email = <email-address>
 
-viewer-release.viewer_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
 # ========================================
@@ -121,25 +109,6 @@ viewer-mesh.viewer_channel = "Project Viewer - Mesh"
 viewer-mesh.viewer_grid = aditi
 viewer-mesh.email = shining@lists.lindenlab.com
 
-# ========================================
-# viewer-pathfinding
-# ========================================
-
-viewer-pathfinding.viewer_channel = "Project Viewer - Pathfinding"
-viewer-pathfinding.viewer_grid = agni
-viewer-pathfinding.build_debug_release_separately = true
-viewer-pathfinding.build_CYGWIN_Debug = false
-viewer-pathfinding.build_viewer_update_version_manager = false
-
-# ========================================
-# viewer-materials
-# ========================================
-
-viewer-materials.viewer_channel = "Second Life Beta Materials"
-viewer-materials.build_debug_release_separately = true
-viewer-materials.build_CYGWIN_Debug = false
-viewer-materials.build_viewer_update_version_manager = false
-
 # =================================================================
 # asset delivery 2010 projects
 # =================================================================
@@ -168,6 +137,14 @@ simon_viewer-dev-private.email_status_this_is_os = false
 vir-project-1.viewer_channel = "Second Life Release"
 
 # ========================================
+# Merov
+# ========================================
+merov-viewer-maint-2287.viewer_channel = "Second Life Project Merchant Outbox"
+merov-viewer-maint-2287.login_channel = "Second Life Project Merchant Outbox"
+merov-viewer-maint-2287.build_viewer_update_version_manager = false
+merov-viewer-maint-2287.codeticket_add_context = false
+
+# ========================================
 # THX-1138 / Runway projects
 # ========================================
 viewer-thx1138-runway-shared.viewer_channel = "Project Viewer - THX-1138 Runway"
@@ -194,7 +171,6 @@ runway.build_debug_release_separately = true
 runway.build_CYGWIN_Debug = false
 runway.build_viewer_update_version_manager = false
 
-
 # eof