diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-05 15:39:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-05 15:39:49 -0400 |
| commit | 561e0bb1a09e613e6fb41f6a31f1b182b9caa19c (patch) | |
| tree | 99affc11ead78852e5f4a57594a037859766e00a /indra/newview/viewer_manifest.py | |
| parent | efba897e45b5065619bbe0e1451a40b6391e503c (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) |