diff options
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index e0c332681e..e823228681 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -66,7 +66,6 @@ class ViewerManifest(LLManifest): with self.prefix(src="app_settings"): self.exclude("logcontrol.xml") self.exclude("logcontrol-dev.xml") - self.path("*.pem") self.path("*.ini") self.path("*.xml") self.path("*.db2") @@ -88,10 +87,10 @@ class ViewerManifest(LLManifest): pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') with self.prefix(src=pkgdir,dst=""): self.path("dictionaries") + self.path("ca-bundle.crt") # include the extracted packages information (see BuildPackagesInfo.cmake) self.path(src=os.path.join(self.args['build'],"packages-info.txt"), dst="packages-info.txt") - # CHOP-955: If we have "sourceid" or "viewer_channel" in the # build process environment, generate it into # settings_install.xml. @@ -563,8 +562,12 @@ class WindowsManifest(ViewerManifest): # Vivox runtimes self.path("SLVoice.exe") - self.path("vivoxsdk.dll") - self.path("ortp.dll") + if (self.address_size == 64): + self.path("vivoxsdk_x64.dll") + self.path("ortp_x64.dll") + else: + self.path("vivoxsdk.dll") + self.path("ortp.dll") self.path("libsndfile-1.dll") self.path("vivoxoal.dll") |