diff options
author | Oz Linden <oz@lindenlab.com> | 2015-06-15 15:53:45 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-06-15 15:53:45 -0400 |
commit | 95fc2d48eced78b2aaa29b9e8b3f9410eed1ad8c (patch) | |
tree | 7748f0142e0ecbc91daa33c42a679799c4375d5e /indra/newview/viewer_manifest.py | |
parent | 96d16928600dbf3666221a19575af9330840cfd5 (diff) | |
parent | e0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff) |
merge changes for 3.7.30-release
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-x | indra/newview/viewer_manifest.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 32cf9d3df6..cae6bded9f 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -387,9 +387,13 @@ class Windows_i686_Manifest(ViewerManifest): if self.args['configuration'].lower() == 'debug': self.path("msvcr120d.dll") self.path("msvcp120d.dll") + self.path("msvcr100d.dll") + self.path("msvcp100d.dll") else: self.path("msvcr120.dll") self.path("msvcp120.dll") + self.path("msvcr100.dll") + self.path("msvcp100.dll") # Vivox runtimes self.path("SLVoice.exe") |