summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-10 22:41:34 -0400
committerOz Linden <oz@lindenlab.com>2011-04-10 22:41:34 -0400
commitfe99404803c0582f845d0d42c0908b96cd6682fb (patch)
tree670291989177f3b408c376f01ab70859751fca04 /BuildParams
parenta84c8e0704e363a9b24f3ee56760178267086793 (diff)
parent0c05c8c89632d2747ca8b364ff663d1d5505fb4d (diff)
merge changes for storm-1118
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams13
1 files changed, 6 insertions, 7 deletions
diff --git a/BuildParams b/BuildParams
index deaea5e047..3b711397e3 100644
--- a/BuildParams
+++ b/BuildParams
@@ -66,7 +66,8 @@ 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
+
# =======================================
# brad
# ========================================
@@ -154,12 +155,10 @@ media.build_viewer_update_version_manager = false
# oz
# ================
-oz-viewer-devreview.build_debug_release_separately = true
-viewer-devreview.build_debug_release_separately = true
-oz_viewer-poreview.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-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
# ========================================
# enus