summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-06-19 12:24:44 -0700
committerMerov Linden <merov@lindenlab.com>2013-06-19 12:24:44 -0700
commitb3c010ea7130331d454c480b82d1309bac712004 (patch)
tree8f5e2ba709ebd52400f2831785e0c07c3396815f /BuildParams
parentd65f09ebcafe6ca968236a9991961983d4cd7a47 (diff)
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
Pull merge lindenlab/viewer-release
Diffstat (limited to 'BuildParams')
-rwxr-xr-xBuildParams12
1 files changed, 12 insertions, 0 deletions
diff --git a/BuildParams b/BuildParams
index b7d7d57cc9..accc019a72 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
# ========================================
@@ -121,6 +122,15 @@ viewer-pathfinding.build_debug_release_separately = true
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
+
# =================================================================
# asset delivery 2010 projects
# =================================================================
@@ -177,3 +187,5 @@ runway.build_viewer_update_version_manager = false
# eof
+
+