summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum_linden <callum@lindenlab.com>2017-12-21 14:36:50 -0800
committercallum_linden <callum@lindenlab.com>2017-12-21 14:36:50 -0800
commit7ac3a755e713d0a34747660b3d48d0a7f6978c3e (patch)
tree2f87990ffc3f0399aaad8b82750a97d2fbcb65e1 /indra
parentdfd62c56d3b2da9e17c17f8e5ee0c09b3333a970 (diff)
MAINT-8119 Fix. 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
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/viewer_manifest.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f930e8b2ce..e0c332681e 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -689,10 +689,10 @@ class WindowsManifest(ViewerManifest):
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