diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-12-16 12:07:19 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-12-16 12:07:19 -0800 |
| commit | ed3bcac5dd7a2dedb8b908f698d14c3e51083350 (patch) | |
| tree | 93b297e19d9f2cb617e33f33d810138d9c438cae /indra/newview | |
| parent | 0c0cb6fd79d12016b32bb74ce0e9d2c656143902 (diff) | |
Fix for another merge bug.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 59b674b1b8..fafcbcc970 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -341,10 +341,11 @@ class WindowsManifest(ViewerManifest): 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 @@ class WindowsManifest(ViewerManifest): 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) |