summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-13 13:28:51 -0400
committerOz Linden <oz@lindenlab.com>2011-05-13 13:28:51 -0400
commit66c078de5e5a6b685d435f7b1a462d64ca80f35e (patch)
treea1fe4ac67d499a565ea98b390dedbeef0a62acc2 /BuildParams
parent27fd0d1a93da8a2ad1aa445e8d8258f9e910ae8c (diff)
parente8ede07451c65aea898bc3f58a980b6b0d9af302 (diff)
merge up to latest viewer-development
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams14
1 files changed, 5 insertions, 9 deletions
diff --git a/BuildParams b/BuildParams
index 3b711397e3..a602be2fe2 100644
--- a/BuildParams
+++ b/BuildParams
@@ -67,11 +67,12 @@ viewer-pre-release.login_channel = "Second Life Release"
viewer-pre-release.build_debug_release_separately = true
viewer-pre-release.build_viewer_update_version_manager = true
#viewer-pre-release.release-viewer.jira = DRTVWR-13
+viewer-pre-release.release-viewer.jira = DRTVWR-46
+
# =======================================
# brad
# ========================================
-
debug-halting.email = cg@lindenlab.com
debug-halting.build_server = false
debug-halting.build_server_tests = false
@@ -158,8 +159,10 @@ media.build_viewer_update_version_manager = false
oz_viewer-devreview.build_debug_release_separately = true
oz_project-1.build_debug_release_separately = true
oz_project-2.build_debug_release_separately = true
-oz_project-3.build_debug_release_separately = true
+oz-project-3.build_debug_release_separately = true
+
+oz_viewer-beta-review.build_debug_release_separately = true
# ========================================
# enus
# ========================================
@@ -168,13 +171,6 @@ viewer-tut-teamcity.email = enus@lindenlab.com
viewer-tut-teamcity.build_server = false
viewer-tut-teamcity.build_server_tests = false
-# ========================================
-# experience
-# ========================================
-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
# =================================================================