summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-18 19:47:34 -0400
committerOz Linden <oz@lindenlab.com>2011-03-18 19:47:34 -0400
commit6ef593580239df7b967cca59d4cfa9fcd8db6aec (patch)
treeefe4c38e5278f34539873fad075821d47c3291c1
parent9923f403226d6c014cb40149c2e31b2fce988803 (diff)
parent6991eafce8545b4a435913cecda89f6b7f3fd369 (diff)
Automated merge with ssh://bitbucket.org/merov_linden/viewer-autobuild2010
-rw-r--r--BuildParams9
1 files changed, 6 insertions, 3 deletions
diff --git a/BuildParams b/BuildParams
index fe6e77151a..502abcf58d 100644
--- a/BuildParams
+++ b/BuildParams
@@ -155,8 +155,7 @@ media.build_viewer_update_version_manager = false
# oz
# ================
-oz_viewer-devreview.build_debug_release_separately = true
-oz_viewer-autobuild2010.build_debug_release_separately = true
+viewer-devreview.build_debug_release_separately = true
# ========================================
# enus
@@ -193,7 +192,11 @@ viewer-asset-delivery-metrics.build_server_tests = false
#==============================================================================
# autobuild viewers
#==============================================================================
-viewer-autobuild.build_link_parallel = false
+viewer-autobuild2010.build_debug_release_separately = true
+viewer-autobuild2010.viewer_channel = "Project Viewer - VS2010"
+viewer-autobuild2010.login_channel = "Project Viewer - VS2010"
+viewer-autobuild2010.viewer_grid = agni
+viewer-autobuild2010.build_link_parallel = false
#========================================
# VS2010