Automated merge with file:///Users/oz/Internal/internal-viewer-development

BuildParams

@@ -15,8 +15,8 @@ S3GET_URL = http://automated-builds-secondlife-com.s3.amazonaws.com/
 S3PUT_URL = https://s3.amazonaws.com/automated-builds-secondlife-com/
 S3ACL = public-read
 
-# Public Inworld Build Status indicator email
-email_status = 4fac962b-e6a9-ee06-fdd1-3818b00e8c6d@lsl.secondlife.com
+# 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  ####
 
@@ -151,11 +151,7 @@ viewer-development.show_changes_since = 2-1-release
 
 # Build Settings
 viewer-development.build_viewer = true
-viewer-development.build_server = false
-viewer-development.build_server_tests = false
 viewer-development.build_Linux = true
-viewer-development.build_hg_bundle = true
-viewer-development.build_docs = true
 viewer-development.viewer_channel = "Second Life Development"
 viewer-development.login_channel = "Second Life Beta Development"
 viewer-development.viewer_grid = agni