Skip to content
Snippets Groups Projects
Commit 1d0575bc authored by Oz Linden's avatar Oz Linden
Browse files

merge beta fix for storm-1060

parents 8053f7a5 f7e5282b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
BuildParams
+ 2
− 0
View file @ 1d0575bc
...@@ -154,6 +154,8 @@ oz_project-4.codeticket_add_context = false ...@@ -154,6 +154,8 @@ oz_project-4.codeticket_add_context = false
oz_viewer-beta-review.build_debug_release_separately = true oz_viewer-beta-review.build_debug_release_separately = true
oz_viewer-beta-review.codeticket_add_context = false oz_viewer-beta-review.codeticket_add_context = false
oz_viewer-beta-review.viewer_channel = "Second Life Beta Viewer"
oz_viewer-beta-review.login_channel = "Second Life Beta Viewer"
oz_viewer-poreview.build_debug_release_separately = true oz_viewer-poreview.build_debug_release_separately = true
oz_viewer-poreview.codeticket_add_context = false oz_viewer-poreview.codeticket_add_context = false
......
indra/newview/viewer_manifest.py
+ 1
− 1
View file @ 1d0575bc
...@@ -147,7 +147,7 @@ class ViewerManifest(LLManifest): ...@@ -147,7 +147,7 @@ class ViewerManifest(LLManifest):
icon_path="icons/" icon_path="icons/"
channel_type=self.channel_lowerword() channel_type=self.channel_lowerword()
if channel_type == 'release' \ if channel_type == 'release' \
or channel_type == 'beta' \ or channel_type == 'betaviewer' \
or channel_type == 'development' \ or channel_type == 'development' \
: :
icon_path += channel_type icon_path += channel_type
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment