diff options
author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-21 10:33:58 -0800 |
---|---|---|
committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-21 10:33:58 -0800 |
commit | e1b198a36b051051941c61d0a558766591ed4cfc (patch) | |
tree | 1809bf28779ab1f9b0cd05c97f94af3b7dfa5532 /BuildParams | |
parent | fdd5348f81d51363a1639de8b3cc4414fc0f4982 (diff) | |
parent | 9c97a200bebe310f91c9ab181fbe337eeab30aaa (diff) |
Merge from trunk
Diffstat (limited to 'BuildParams')
-rw-r--r-- | BuildParams | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/BuildParams b/BuildParams index 8e4164d5ca..0a4271f7a8 100644 --- a/BuildParams +++ b/BuildParams @@ -46,9 +46,6 @@ 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 -# Settings to test new code ticket service -viewer-beta.codeticket_server_url = "http://pdp75.lindenlab.com:8000/codeticket/linden/" -viewer-beta.codeticket_add_context = true # ======================================== # Viewer Release @@ -212,5 +209,29 @@ viewer-tut-teamcity.email = enus@lindenlab.com viewer-tut-teamcity.build_server = false viewer-tut-teamcity.build_server_tests = false +# ======================================== +# experience +# ======================================== +viewer-experience.public_build = false +viewer-experience.viewer_channel = "Second Life SkyLight Viewer" +viewer-experience.login_channel = "Second Life SkyLight Viewer" + +# ================================================================= +# asset delivery 2010 projects +# ================================================================= +viewer-asset-delivery.viewer_channel = "Second Life Development" +viewer-asset-delivery.login_channel = "Second Life Development" +viewer-asset-delivery.build_viewer_update_version_manager = false +viewer-asset-delivery.email = monty@lindenlab.com +viewer-asset-delivery.build_server = false +viewer-asset-delivery.build_server_tests = false + +viewer-asset-delivery-metrics.viewer_channel = "Second Life Development" +viewer-asset-delivery-metrics.login_channel = "Second Life Development" +viewer-asset-delivery-metrics.build_viewer_update_version_manager = false +viewer-asset-delivery-metrics.email = monty@lindenlab.com +viewer-asset-delivery-metrics.build_server = false +viewer-asset-delivery-metrics.build_server_tests = false + # eof |