diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
| commit | 13de92740e55e8ba5111e1cd16e239ebeda3a578 (patch) | |
| tree | 5da5b829085d2a19422ce1f2f987b395080369cc /BuildParams | |
| parent | ab431d1774d5b282836a3327dd0bfa8b3b91632b (diff) | |
| parent | 9a2e35f7cab1ba119e9887cd307f021fc6ae0bd5 (diff) | |
merge latest viewer-development
Diffstat (limited to 'BuildParams')
| -rw-r--r-- | BuildParams | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/BuildParams b/BuildParams index 07e9298e25..348228784d 100644 --- a/BuildParams +++ b/BuildParams @@ -69,8 +69,7 @@ viewer-pre-release.viewer_channel = "Second Life Release" viewer-pre-release.login_channel = "Second Life Release" viewer-pre-release.build_debug_release_separately = true viewer-pre-release.build_viewer_update_version_manager = true -#viewer-pre-release.release-viewer.jira = DRTVWR-13 -viewer-pre-release.release-viewer.jira = DRTVWR-46 +#viewer-pre-release.release-viewer.jira = DRTVWR-46 # ======================================= @@ -103,6 +102,16 @@ mesh-development.build_CYGWIN_Debug = false mesh-development.build_viewer_update_version_manager = false # ======================================== +# mesh-asset-deprecation +# ======================================== +mesh-asset-deprecation.viewer_channel = "Project Viewer - Mesh Asset Deprecation" +mesh-asset-deprecation.login_channel = "Project Viewer - Mesh Asset Deprecation" +mesh-asset-deprecation.viewer_grid = aditi +mesh-asset-deprecation.build_debug_release_separately = true +mesh-asset-deprecation.build_CYGWIN_Debug = false +mesh-asset-deprecation.build_viewer_update_version_manager = false + +# ======================================== # viewer-mesh # ======================================== @@ -187,10 +196,11 @@ oz_viewer-poreview.build_debug_release_separately = true oz_project-1.build_debug_release_separately = true oz_project-2.build_debug_release_separately = true - oz_project-3.build_debug_release_separately = true - oz_viewer-beta-review.build_debug_release_separately = true +oz_viewer-poreview.build_debug_release_separately = true +oz_viewer-poreview.codeticket_add_context = false + # ======================================== # enus # ======================================== |