summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-06-19 09:58:43 -0700
committerdolphin <dolphin@lindenlab.com>2013-06-19 09:58:43 -0700
commitea40b3a37b0f9b7e09e999a2c6529905e251ecad (patch)
tree9cfb5603040efc7738bca633b902c190db28b0bf /BuildParams
parentebc604fa8d12fb08fda1ac55aae817ad0135bb6b (diff)
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
Merge with viewer 3.6.0
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
+
+