summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.hgtags2
-rw-r--r--BuildParams11
2 files changed, 8 insertions, 5 deletions
diff --git a/.hgtags b/.hgtags
index b982a7eea2..ec1576c43c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -101,6 +101,8 @@ d1203046bb653b763f835b04d184646949d8dd5c 2.6.2-beta1
ec32f1045e7c2644015245df3a9933620aa194b8 2.6.3-start
d7fcefabdf32bb61a9ea6d6037c1bb26190a85bc DRTVWR-47_2.6.3-beta1
d7fcefabdf32bb61a9ea6d6037c1bb26190a85bc 2.6.3-beta1
+0630e977504af5ea320c58d33cae4e1ddee793e9 DRTVWR-48_2.6.3-beta2
+0630e977504af5ea320c58d33cae4e1ddee793e9 2.6.3-beta2
74cd32a06837b0c2cb793b2e8d4d82f5d49462b2 2.6.4-start
74cd32a06837b0c2cb793b2e8d4d82f5d49462b2 2.6.4-start
f632f87bb71b0f13d21f2f64b0c42cedb008c749 2.6.4-start
diff --git a/BuildParams b/BuildParams
index 3b711397e3..f8d078250b 100644
--- a/BuildParams
+++ b/BuildParams
@@ -66,12 +66,12 @@ 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-13
+viewer-pre-release.release-viewer.jira = DRTVWR-42
+
# =======================================
# brad
# ========================================
-
debug-halting.email = cg@lindenlab.com
debug-halting.build_server = false
debug-halting.build_server_tests = false
@@ -156,9 +156,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-1.build_debug_release_separately = true
+oz-project-2.build_debug_release_separately = true
+oz-project-3.build_debug_release_separately = true
+
# ========================================
# enus