summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-17 16:50:35 -0400
committerOz Linden <oz@lindenlab.com>2013-06-17 16:50:35 -0400
commit761bf254a4e72ec521ff1a52ac12f8594a350818 (patch)
treec72f84bb4ac319c10299a35934b52a09a73a127d /BuildParams
parenta2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (diff)
parent1e41b017e1713a35eb68190d279cf8d28791b6d2 (diff)
merge changes for 3.6.0-release
Diffstat (limited to 'BuildParams')
-rwxr-xr-xBuildParams11
1 files changed, 11 insertions, 0 deletions
diff --git a/BuildParams b/BuildParams
index a4b361261f..84d30f651b 100755
--- a/BuildParams
+++ b/BuildParams
@@ -60,6 +60,7 @@ viewer-release.build_debug_release_separately = true
viewer-release.build_viewer_update_version_manager = true
viewer-release.codeticket_add_context = false
+
# ========================================
# mesh-development
# ========================================
@@ -122,6 +123,14 @@ viewer-pathfinding.build_CYGWIN_Debug = false
viewer-pathfinding.build_viewer_update_version_manager = false
# ========================================
+# viewer-materials
+# ========================================
+
+viewer-materials.viewer_channel = "Second Life Beta Materials"
+viewer-materials.build_debug_release_separately = true
+viewer-materials.build_CYGWIN_Debug = false
+viewer-materials.build_viewer_update_version_manager = false
+
# viewer-chui
#
# ========================================
@@ -189,3 +198,5 @@ runway.build_viewer_update_version_manager = false
# eof
+
+