summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-05-07 11:01:58 -0700
committerMerov Linden <merov@lindenlab.com>2011-05-07 11:01:58 -0700
commit460aa3ade72fe999eebccb390ae371dfdfeaf125 (patch)
tree0f74ec821139deb23057956e89ef7d814c82c671 /BuildParams
parentc03eb76bcf66665ee8a7618dbec0d13e3fc66c32 (diff)
parent51c779b5e832a0c303b4c84c7263c7fed3bd9b30 (diff)
Merge with viewer-experience
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams11
1 files changed, 9 insertions, 2 deletions
diff --git a/BuildParams b/BuildParams
index c0955cfeda..a602be2fe2 100644
--- a/BuildParams
+++ b/BuildParams
@@ -66,11 +66,13 @@ viewer-pre-release.viewer_channel = "Second Life Release"
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-42
+#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
@@ -155,7 +157,12 @@ 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_viewer-beta-review.build_debug_release_separately = true
# ========================================
# enus
# ========================================