From 7a8847d3b058c3bb410db1367b1e3872cbc70ef0 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Thu, 28 May 2020 08:02:41 -0500 Subject: [PATCH] Fix broken Mac installer background and hopefully not screw up Windows installers. --- indra/newview/viewer_manifest.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index d86342cda0..73d182862c 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -254,10 +254,8 @@ class ViewerManifest(LLManifest,FSViewerManifest): # Somehow, we started leaving the - separating the variant from the app name # on the beginning of the channel qualifier. This screws up later processing that # depends on the channel type. If it's there, we chop it off. - # Well, not for 6.3.9...this is broken elsewhere and we're too rushed to fix - # it properly, so we kludge our way around it elsewhere. - #if channel_qualifier[0] == '-': - # channel_qualifier = channel_qualifier[1:] + if channel_qualifier[0] == '-': + channel_qualifier = channel_qualifier[1:] if channel_qualifier.startswith('release'): channel_type='release' elif channel_qualifier.startswith('beta'): @@ -277,8 +275,9 @@ class ViewerManifest(LLManifest,FSViewerManifest): # get any part of the channel name after the CHANNEL_VENDOR_BASE suffix=self.channel_variant() # by ancient convention, we don't use Release in the app name - if self.channel_type() == 'release': - suffix=suffix.replace('Release', '').strip() + # Well, LL doesn't, but we do. Don't remove it. + #if self.channel_type() == 'release': + # suffix=suffix.replace('Release', '').strip() # for the base release viewer, suffix will now be null - for any other, append what remains if suffix: #suffix = "_".join([''] + suffix.split()) @@ -308,10 +307,12 @@ class ViewerManifest(LLManifest,FSViewerManifest): def app_name(self): global CHANNEL_VENDOR_BASE channel_type=self.channel_type() - if channel_type == 'release': - app_suffix='Viewer' - else: - app_suffix=self.channel_variant() + # LL uses "Viewer" in the name of their release package. We use "Release". + #if channel_type == 'release': + # app_suffix='Viewer' + #else: + # app_suffix=self.channel_variant() + app_suffix=self.channel_variant() # tag "OS" after CHANNEL_VENDOR_BASE and before any suffix if self.fs_is_opensim():