summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-08-19 16:12:07 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-08-19 16:12:07 -0600
commit1616b73ef30bcb3e99be68fb7ccc05f0be78ddf6 (patch)
treee22c94948ed8d8c7f35422fc064172ea3662b264 /indra/newview/viewer_manifest.py
parentea45b8acd25785bd2789c2c1928e223c9a8e2fbd (diff)
parentd8c02bf06250015b8cb0bcc9c0d8445cfb6acf1c (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
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)