diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-04 14:28:34 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-04 14:28:34 -0800 |
| commit | c7e2f81bbf299cf884d9e687fc4a7e7f7096c877 (patch) | |
| tree | 1436dbf2dfac1deecee4a2ded9a891b7bf68bfb5 /BuildParams | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
| parent | d2b604c61181a03bb16f2b951b6f86c582860759 (diff) | |
Pull merge from viewer-maint-2287 aka Merchant Outbox
Diffstat (limited to 'BuildParams')
| -rwxr-xr-x | BuildParams | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/BuildParams b/BuildParams index ede2595cd3..c0676c2afd 100755 --- a/BuildParams +++ b/BuildParams @@ -174,6 +174,14 @@ simon_viewer-dev-private.email_status_this_is_os = false vir-project-1.viewer_channel = "Second Life Release" # ======================================== +# Merov +# ======================================== +merov-viewer-maint-2287.viewer_channel = "Second Life Project Merchant Outbox" +merov-viewer-maint-2287.login_channel = "Second Life Project Merchant Outbox" +merov-viewer-maint-2287.build_viewer_update_version_manager = false +merov-viewer-maint-2287.codeticket_add_context = false + +# ======================================== # THX-1138 / Runway projects # ======================================== viewer-thx1138-runway-shared.viewer_channel = "Project Viewer - THX-1138 Runway" |