diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-08-17 21:16:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-08-17 21:16:57 -0400 |
| commit | ba64912c20ec1ff14bdbdec0ac1dabe81f306124 (patch) | |
| tree | a0878f9a004131ba66bdecda3c55ab8ee8755209 | |
| parent | 84e3e7ccb451f294901102473d8c274ef619595f (diff) | |
| parent | 8aae5a105b2e0f221ee074e30008f56697981665 (diff) | |
Automated merge with file:///Users/oz/Internal/internal-viewer-development
| -rw-r--r-- | BuildParams | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/develop.py | 0 |
2 files changed, 2 insertions, 6 deletions
diff --git a/BuildParams b/BuildParams index 058205ad98..de6d4064c6 100644 --- a/BuildParams +++ b/BuildParams @@ -15,8 +15,8 @@ S3GET_URL = http://automated-builds-secondlife-com.s3.amazonaws.com/ S3PUT_URL = https://s3.amazonaws.com/automated-builds-secondlife-com/ S3ACL = public-read -# Public Inworld Build Status indicator email -email_status = 4fac962b-e6a9-ee06-fdd1-3818b00e8c6d@lsl.secondlife.com +# Update Public Inworld Build Status Indicators +email_status_this_is_os = true #### P r o d u c t i o n B u i l d s #### @@ -151,11 +151,7 @@ viewer-development.show_changes_since = 2-1-release # Build Settings viewer-development.build_viewer = true -viewer-development.build_server = false -viewer-development.build_server_tests = false viewer-development.build_Linux = true -viewer-development.build_hg_bundle = true -viewer-development.build_docs = true viewer-development.viewer_channel = "Second Life Development" viewer-development.login_channel = "Second Life Beta Development" viewer-development.viewer_grid = agni diff --git a/indra/develop.py b/indra/develop.py index 63df0e983a..63df0e983a 100644..100755 --- a/indra/develop.py +++ b/indra/develop.py |