summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-08-05 14:11:52 -0700
committerMerov Linden <merov@lindenlab.com>2013-08-05 14:11:52 -0700
commitf6c7b7ac76725a2364f323aba671d12b6cd552a8 (patch)
tree6ce21a5e956181fe2bdb9b9190d863bf04e0d735 /indra/newview/viewer_manifest.py
parent152d76e13ee553e9c9191a14053b119583b21abc (diff)
parent32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff)
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 53a3e732ca..5e08e54b7c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -366,6 +366,7 @@ class WindowsManifest(ViewerManifest):
self.path("zlib1.dll")
self.path("vivoxplatform.dll")
self.path("vivoxoal.dll")
+ self.path("ca-bundle.crt")
# Security
self.path("ssleay32.dll")
@@ -726,6 +727,7 @@ class DarwinManifest(ViewerManifest):
'libvivoxoal.dylib',
'libvivoxsdk.dylib',
'libvivoxplatform.dylib',
+ 'ca-bundle.crt',
'SLVoice',
):
self.path2basename(libdir, libfile)