summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-07-18 17:27:31 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-07-18 17:27:31 -0400
commit1bea6e50aa11f691759c6c30850a3415edaa6383 (patch)
tree803fb6c5b2ffcec6296a333fe25a9d0c60abceba /BuildParams
parentd6d2159bf875884bb060aaf8234478dd1ec478b4 (diff)
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
Merge. Refresh from viewer-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
+
+