From ed3bcac5dd7a2dedb8b908f698d14c3e51083350 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Wed, 16 Dec 2009 12:07:19 -0800
Subject: [PATCH] Fix for another merge bug.
---
indra/newview/viewer_manifest.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 59b674b1b8b..fafcbcc970b 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -341,10 +341,11 @@ def construct(self):
self.path("qtnetworkd4.dll")
self.path("qtopengld4.dll")
self.path("qtwebkitd4.dll")
+ self.path("qtxmlpatternsd4.dll")
self.path("ssleay32.dll")
# For WebKit/Qt plugin runtimes (image format plugins)
- if self.prefix(src="imageformats", dst="llplugin/imageformats"):
+ if self.prefix(src="imageformats", dst="llplugin/imageformats"):
self.path("qgifd4.dll")
self.path("qicod4.dll")
self.path("qjpegd4.dll")
@@ -363,7 +364,7 @@ def construct(self):
self.path("qtnetwork4.dll")
self.path("qtopengl4.dll")
self.path("qtwebkit4.dll")
- self.path("qtxmlpatterns4.dll")
+ self.path("qtxmlpatterns4.dll")
self.path("ssleay32.dll")
# For WebKit/Qt plugin runtimes (image format plugins)
--
GitLab