diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-08 16:52:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-08 16:52:08 -0400 |
| commit | 1d0575bcc4d2740dc4b6e7009b6788ac88744eb5 (patch) | |
| tree | d69a06af547206a0112ff752d013f8ad7196e47f | |
| parent | 8053f7a5b0d7d0ca4440bddca921406461bb063c (diff) | |
| parent | f7e5282badf8756614d8907f307adfa7ac1ce09c (diff) | |
merge beta fix for storm-1060
| -rwxr-xr-x | BuildParams | 2 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/BuildParams b/BuildParams index 5250dab03c..10d16ff7d7 100755 --- a/BuildParams +++ b/BuildParams @@ -154,6 +154,8 @@ oz_project-4.codeticket_add_context = false oz_viewer-beta-review.build_debug_release_separately = true 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.codeticket_add_context = false diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 34565835e9..07382e8e85 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -147,7 +147,7 @@ class ViewerManifest(LLManifest): icon_path="icons/" channel_type=self.channel_lowerword() if channel_type == 'release' \ - or channel_type == 'beta' \ + or channel_type == 'betaviewer' \ or channel_type == 'development' \ : icon_path += channel_type |