summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-21 15:14:39 -0500
committerOz Linden <oz@lindenlab.com>2011-01-21 15:14:39 -0500
commit4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (patch)
treede6ce52d54764b0cf7d0c33d17d1cd7e71ffad1b /BuildParams
parent3571e83b6413e0c1050540a6cddeeaa7c6ca91c1 (diff)
parent2d6228b4e0454c7d82770748eb572258c402319c (diff)
merge changes for storm-869
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams21
1 files changed, 18 insertions, 3 deletions
diff --git a/BuildParams b/BuildParams
index e2d97211ed..0a4271f7a8 100644
--- a/BuildParams
+++ b/BuildParams
@@ -46,9 +46,6 @@ 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
-# Settings to test new code ticket service
-viewer-beta.codeticket_server_url = "http://pdp75.lindenlab.com:8000/codeticket/linden/"
-viewer-beta.codeticket_add_context = true
# ========================================
# Viewer Release
@@ -219,4 +216,22 @@ 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
+# =================================================================
+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
+viewer-asset-delivery-metrics.build_server_tests = false
+
+
# eof