summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-05-02 17:57:52 -0700
committerRichard Linden <none@none>2011-05-02 17:57:52 -0700
commitd5faa4f38d338777463b7ad6eb3239041d43fe28 (patch)
treed57efbda59c9f677b2245bebc97fec129f3f9fad /BuildParams
parent9a6f06687e5b467f0c049bfbf88c2131eee11ef3 (diff)
parent78d76eb4b01e0bd6db41a67d1573a1b841cbe993 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/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
# ========================================