diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-06-14 14:16:23 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-06-14 14:16:23 -0700 |
| commit | c538ff12c5a75ba9aa51648e97fd629a9a2829e9 (patch) | |
| tree | 65f4e817b40adcd2b2c461ceead9aeb0dc12dcb9 /indra/newview/viewer_manifest.py | |
| parent | bcf7195bce14efb8e36da0f6e4cfb1491e78c331 (diff) | |
SL-700: temporarily use local version of ca-bundle.crt instead of from voice, misc cleanup
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index d9fef022e5..5ccedee06d 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -482,7 +482,7 @@ class WindowsManifest(ViewerManifest): self.path(src="licenses-win32.txt", dst="licenses.txt") self.path("featuretable.txt") - self.path("featuretable_xp.txt") + self.path("ca-bundle.crt") # Media plugins - CEF if self.prefix(src='../media_plugins/cef/%s' % self.args['configuration'], dst="llplugin"): @@ -836,6 +836,7 @@ class DarwinManifest(ViewerManifest): self.path("licenses-mac.txt", dst="licenses.txt") self.path("featuretable_mac.txt") self.path("SecondLife.nib") + self.path("ca-bundle.crt") icon_path = self.icon_path() if self.prefix(src=icon_path, dst="") : @@ -1295,6 +1296,7 @@ class LinuxManifest(ViewerManifest): print "Skipping llcommon.so (assuming llcommon was linked statically)" self.path("featuretable_linux.txt") + self.path("ca-bundle.crt") def package_finish(self): installer_name = self.installer_base_name() |