diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-07 21:01:07 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-07 21:01:07 +0200 |
| commit | 7539c8bbde67c5dc438cf93689cc7940b83c2de4 (patch) | |
| tree | eb91147894603c338a124be4f023cd2097a7edaa | |
| parent | 910a1d704e35d5789e4a8c34efa89ed8d7f3bf9d (diff) | |
| parent | 629b8eab09a59910ac6a8e019cffed5483bff407 (diff) | |
Merged in lindenlab/viewer-lynx
| -rw-r--r-- | autobuild.xml | 14 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
2 files changed, 8 insertions, 12 deletions
diff --git a/autobuild.xml b/autobuild.xml index e79f1995fb..513728623b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ <key>archive</key> <map> <key>hash</key> - <string>47cc9838ae792bb8181660670ecc44b6</string> + <string>118987b1a5b56214cfdbd0c763e180da</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27180/217946/dullahan-1.1.1093_3.3538.1849.g458cc98-darwin64-521408.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15127/97748/dullahan-1.1.1080_3.3325.1750.gaabe4c4-darwin64-513449.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -568,9 +568,9 @@ <key>archive</key> <map> <key>hash</key> - <string>8651fa9fc3b8669e58fbb2120d85fe14</string> + <string>2ecc71350b30a1057091b9cd7af18b1c</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27183/217958/dullahan-1.1.1093_3.3538.1849.g458cc98-windows-521408.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15128/97755/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows-513449.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -580,16 +580,16 @@ <key>archive</key> <map> <key>hash</key> - <string>c62507978d4d918db4529e48c19da4ca</string> + <string>2ed3e49388514dafb907c59a209d580e</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27182/217960/dullahan-1.1.1093_3.3538.1849.g458cc98-windows64-521408.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15129/97760/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows64-513449.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>1.1.1093_3.3538.1849.g458cc98</string> + <string>1.1.1080_3.3325.1750.gaabe4c4</string> </map> <key>elfio</key> <map> diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 4ab910644c..541112a765 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -622,11 +622,7 @@ class WindowsManifest(ViewerManifest): self.path("dullahan_host.exe") self.path("natives_blob.bin") self.path("snapshot_blob.bin") - self.path("v8_context_snapshot.bin") - - with self.prefix(src=os.path.join(pkgdir, 'bin', config, 'swiftshader'), dst=os.path.join('llplugin', 'swiftshader')): - self.path("libEGL.dll") - self.path("libGLESv2.dll") + self.path("widevinecdmadapter.dll") # MSVC DLLs needed for CEF and have to be in same directory as plugin with self.prefix(src=os.path.join(os.pardir, 'sharedlibs', 'Release'), dst="llplugin"): |