diff options
| author | McCabe Maxsted | 2010-08-12 16:09:25 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-26 11:20:48 -0700 |
| commit | 9f39aa9b0800de19850ca5b518f5e18fed18091f (patch) | |
| tree | 738c25db137cef81c04c1fcc804c4ada9177dd54 /linden/indra | |
| parent | Re-added voice in CopyWinLibs.cmake and viewer_manifest.py--amend (diff) | |
| download | meta-impy-9f39aa9b0800de19850ca5b518f5e18fed18091f.zip meta-impy-9f39aa9b0800de19850ca5b518f5e18fed18091f.tar.gz meta-impy-9f39aa9b0800de19850ca5b518f5e18fed18091f.tar.bz2 meta-impy-9f39aa9b0800de19850ca5b518f5e18fed18091f.tar.xz | |
Commented out unused .config files from viewer_manifest.py and made sure it uses the right llkdu.dll.2.config
Diffstat (limited to 'linden/indra')
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index a376d98..c35a11e 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -247,13 +247,14 @@ class WindowsManifest(ViewerManifest): | |||
| 247 | self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config") | 247 | self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config") |
| 248 | 248 | ||
| 249 | # We need this one too, so that llkdu loads at runtime - DEV-41194 | 249 | # We need this one too, so that llkdu loads at runtime - DEV-41194 |
| 250 | self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="llkdu.dll.2.config") | 250 | #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="llkdu.dll.2.config") |
| 251 | self.path("llkdu.dll.2.config") | ||
| 251 | 252 | ||
| 252 | # We need this one too, so that win_crash_logger.exe loads at runtime - DEV-19004 | 253 | # We need this one too, so that win_crash_logger.exe loads at runtime - DEV-19004 |
| 253 | self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="win_crash_logger.exe.config") | 254 | #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="win_crash_logger.exe.config") |
| 254 | 255 | ||
| 255 | # same thing for auto-updater. | 256 | # same thing for auto-updater. |
| 256 | self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="updater.exe.config") | 257 | #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="updater.exe.config") |
| 257 | 258 | ||
| 258 | # Mozilla runtime DLLs (CP) | 259 | # Mozilla runtime DLLs (CP) |
| 259 | if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): | 260 | if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): |