summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-10-20 12:18:33 -0400
committerLoren Shih <seraph@lindenlab.com>2010-10-20 12:18:33 -0400
commit76876538715e3afbe456e2bf84173bde416d50e6 (patch)
tree423b27e9a5ef5c463b066b0fb5a50bda25060869 /BuildParams
parent0682e10532e058462d2bb1d5379c55d0e4d757e9 (diff)
parent04425000ae60b1fccf4feac1d4d84796d3b6b27d (diff)
Automated merge up from viewer-development
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams26
1 files changed, 24 insertions, 2 deletions
diff --git a/BuildParams b/BuildParams
index 4db8cfdfb4..3247bcdbdb 100644
--- a/BuildParams
+++ b/BuildParams
@@ -39,8 +39,9 @@ snowstorm_viewer-development.email = viewer-development-builds@lists.secondlife.
# ========================================
# Viewer Beta
# ========================================
-viewer-beta.viewer_channel = "Second Life Beta"
-viewer-beta.login_channel = "Second Life Beta"
+viewer-beta.viewer_channel = "Second Life Beta Viewer"
+viewer-beta.login_channel = "Second Life Beta Viewer"
+viewer-beta.build_debug_release_separately = true
viewer-beta.build_viewer_update_version_manager = true
# ========================================
@@ -48,6 +49,7 @@ viewer-beta.build_viewer_update_version_manager = true
# ========================================
viewer-release.viewer_channel = "Second Life Release"
viewer-release.login_channel = "Second Life Release"
+viewer-release.build_debug_release_separately = true
viewer-release.build_viewer_update_version_manager = true
# ========================================
@@ -118,6 +120,26 @@ gooey.viewer_grid = agni
gooey.build_viewer_update_version_manager = false
# ========================================
+# Display Names project
+# ========================================
+
+#viewer-identity-evolution.email = leyla@lindenlab.com
+viewer-identity.build_Debug = false
+viewer-identity.build_RelWithDebInfo = false
+viewer-identity.build_viewer = true
+viewer-identity.build_server = false
+viewer-identity.build_server_tests = false
+viewer-identity.build_Linux = true
+viewer-identity.build_hg_bundle = true
+viewer-identity.bulld_docs = true
+viewer-identity.viewer_channel = "Second Life Project Viewer"
+viewer-identity.login_channel = "Second Life Project Viewer"
+viewer-identity.viewer_grid = aditi
+viewer-identity.build_viewer_update_version_manager = false
+
+
+
+# ========================================
# palange
# ========================================