summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-01-04 09:06:07 -0500
committerOz Linden <oz@lindenlab.com>2012-01-04 09:06:07 -0500
commit1ce22e0a5dd62bc6a750fbdd39719190360af611 (patch)
tree479fae0c1324a5de8fa23c04c406ebc8fb7a3632 /BuildParams
parentef0057909fcf7eaee6bdff4a58492fd17ffdd9a4 (diff)
parent570d562f5871f40bd7f8c683db5316ffd0133335 (diff)
merge changes for latest viewer-development
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams20
1 files changed, 11 insertions, 9 deletions
diff --git a/BuildParams b/BuildParams
index 3f5d6f8c6b..c051397853 100644
--- a/BuildParams
+++ b/BuildParams
@@ -145,6 +145,17 @@ oz_viewer-devreview.codeticket_add_context = false
oz_viewer-devreview.build_enforce_coding_policy = true
oz_viewer-devreview.email = oz@lindenlab.com
+oz_viewer-trial.build_debug_release_separately = true
+oz_viewer-trial.codeticket_add_context = false
+oz_viewer-trial.build_enforce_coding_policy = true
+oz_viewer-trial.email = oz@lindenlab.com
+
+oz_viewer-beta-review.build_debug_release_separately = true
+oz_viewer-beta-review.codeticket_add_context = false
+oz_viewer-beta-review.viewer_channel = "Second Life Beta Viewer"
+oz_viewer-beta-review.login_channel = "Second Life Beta Viewer"
+oz_viewer-beta-review.email = oz@lindenlab.com
+
oz_project-1.build_debug_release_separately = true
oz_project-1.codeticket_add_context = false
oz_project-1.email = oz@lindenlab.com
@@ -157,15 +168,6 @@ oz_project-3.email = oz@lindenlab.com
oz_project-4.build_debug_release_separately = true
oz_project-4.codeticket_add_context = false
oz_project-4.email = oz@lindenlab.com
-oz_project-5.build_debug_release_separately = true
-oz_project-5.codeticket_add_context = false
-oz_project-5.email = oz@lindenlab.com
-
-oz_viewer-beta-review.build_debug_release_separately = true
-oz_viewer-beta-review.codeticket_add_context = false
-oz_viewer-beta-review.viewer_channel = "Second Life Beta Viewer"
-oz_viewer-beta-review.login_channel = "Second Life Beta Viewer"
-oz_viewer-beta-review.email = oz@lindenlab.com
# =================================================================
# asset delivery 2010 projects