diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-24 14:41:16 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-24 14:41:16 -0400 |
| commit | 7f2ad72fe65a67afb2c72867e765acad7488cf97 (patch) | |
| tree | 79cad424a018d8a50cbd2478b32940bfd7586ded | |
| parent | 559173f71196602dd85211a786af7829ab2877c4 (diff) | |
| parent | 5a661a4d82e2e4e08b5a6ab87e24571b2d5f05af (diff) | |
merge changes for DRTVWR-326 3.6.1-beta1
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 35451c9621..53a3e732ca 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -172,7 +172,7 @@ class ViewerManifest(LLManifest): def app_name(self): app_suffix='Test' channel_type=self.channel_lowerword() - if channel_type == 'release' : + if channel_type.startswith('release') : app_suffix='Viewer' elif re.match('^(beta|project).*',channel_type) : app_suffix=self.channel_unique() @@ -182,8 +182,8 @@ class ViewerManifest(LLManifest): icon_path="icons/" channel_type=self.channel_lowerword() print "Icon channel type '%s'" % channel_type - if channel_type == 'release' : - icon_path += channel_type + if channel_type.startswith('release') : + icon_path += 'release' elif re.match('^beta.*',channel_type) : icon_path += 'beta' elif re.match('^project.*',channel_type) : @@ -242,7 +242,7 @@ class WindowsManifest(ViewerManifest): def final_exe(self): app_suffix="Test" channel_type=self.channel_lowerword() - if channel_type == 'release' : + if channel_type.startswith('release') : app_suffix='' elif re.match('^(beta|project).*',channel_type) : app_suffix=''.join(self.channel_unique().split()) |