From 6b3ac6823d7d2eb1566b70c69109ffd57faa4e97 Mon Sep 17 00:00:00 2001
From: callum_linden <callum@lindenlab.com>
Date: Thu, 21 Dec 2017 13:08:32 -0800
Subject: [PATCH] A change elsewhere in the viewer_manifest.py script that
copies files into the right place after a build impacted the fragment of code
that copies over the VLC runtime files (Libvlc.dll, libvlccore.dll and the
VLC plugins dir) and they never made it to the right place. This change
restores that copy
---
indra/newview/viewer_manifest.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f930e8b2ce2..e0c332681e3 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -689,10 +689,10 @@ def construct(self):
self.path("zh-CN.pak")
self.path("zh-TW.pak")
- with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="llplugin"):
- self.path("libvlc.dll")
- self.path("libvlccore.dll")
- self.path("plugins/")
+ with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="llplugin"):
+ self.path("libvlc.dll")
+ self.path("libvlccore.dll")
+ self.path("plugins/")
# pull in the crash logger and updater from other projects
# tag:"crash-logger" here as a cue to the exporter
--
GitLab