diff options
| author | simon <none@none> | 2015-06-15 12:35:45 -0700 |
|---|---|---|
| committer | simon <none@none> | 2015-06-15 12:35:45 -0700 |
| commit | 1a470f11cda7ee31af2aeafb6e0ac173798ead57 (patch) | |
| tree | 396f9c3022636ca8e5d7cf10a74c7ad47309c136 /indra/newview | |
| parent | ad635e9f0eb32df227e96d5c5fd751a36ef61d92 (diff) | |
| parent | e0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff) | |
Merge downstream code and become version 3.7.31
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index ef239df8cd..ca06baa571 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.7.30 +3.7.31 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") |