summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorsimon <none@none>2015-06-12 12:55:14 -0700
committersimon <none@none>2015-06-12 12:55:14 -0700
commit3aeb346b4cc1f8fc47924b34feb321c99d3330b3 (patch)
tree5b5a9a5616bad41a8399627784c714c264accd76 /indra/newview
parent30d35f5cfbeec2d5d0dc0f85ff31d0bab4a56e87 (diff)
parentc76e983b03f281d71844e2aad72056e541f3e4bf (diff)
Merge fix for MAINT-5277 into experience tools branch
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/viewer_manifest.py4
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")