diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-05 15:10:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-05 15:10:39 -0400 |
| commit | 91a91d1b23394bb0e3b0fb4af21703e3d6e9437a (patch) | |
| tree | 6eda4baca46b5df037bb2ffd4af76f5fa4b2e29f /indra/newview/viewer_manifest.py | |
| parent | b75213b39ad7456d04d3e1644f2116853ead0da0 (diff) | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
merge changes for 3.6.2-release
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
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) |