summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-10 22:37:53 -0400
committerOz Linden <oz@lindenlab.com>2011-04-10 22:37:53 -0400
commite2baffa940a5797f2055f13ceb9722de524b2ec3 (patch)
treebf53bf6b8856a20d732f57d41a28a2c71941ac65 /BuildParams
parent74787fda486a68e344caf125fc76c80ca9c40822 (diff)
parentc77fcfb7a8aeb2f271b050171bf0d6a9bd4c955b (diff)
merge changes for storm-610
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