diff options
-rw-r--r-- | ChangeLog.txt | 1 | ||||
-rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index b66f4b7..8adec60 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -2,6 +2,7 @@ | |||
2 | 2 | ||
3 | * linden/indra/newview/viewer_manifest.py: | 3 | * linden/indra/newview/viewer_manifest.py: |
4 | Commented out fmod from viewer manifest. | 4 | Commented out fmod from viewer manifest. |
5 | Commented out kdu from viewer manifest. | ||
5 | 6 | ||
6 | * Updated to SL source 1.21.6. | 7 | * Updated to SL source 1.21.6. |
7 | 8 | ||
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index c9a5812..43d93b7 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
@@ -152,13 +152,13 @@ class WindowsManifest(ViewerManifest): | |||
152 | # nor do we have a fixed name for the executable | 152 | # nor do we have a fixed name for the executable |
153 | self.path(self.find_existing_file('debug/secondlife-bin.exe', 'release/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe()) | 153 | self.path(self.find_existing_file('debug/secondlife-bin.exe', 'release/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe()) |
154 | # need to get the kdu dll from any of the build directories as well | 154 | # need to get the kdu dll from any of the build directories as well |
155 | self.path(self.find_existing_file( | 155 | #self.path(self.find_existing_file( |
156 | # *FIX:Mani we need to add support for packaging specific targets. | 156 | # *FIX:Mani we need to add support for packaging specific targets. |
157 | #'../llkdu/debug/llkdu.dll', | 157 | #'../llkdu/debug/llkdu.dll', |
158 | '../llkdu/release/llkdu.dll', | 158 | #'../llkdu/release/llkdu.dll', |
159 | '../llkdu/relwithdebinfo/llkdu.dll', | 159 | #'../llkdu/relwithdebinfo/llkdu.dll', |
160 | '../../libraries/i686-win32/lib/release/llkdu.dll'), | 160 | #'../../libraries/i686-win32/lib/release/llkdu.dll'), |
161 | dst='llkdu.dll') | 161 | # dst='llkdu.dll') |
162 | self.path(src="licenses-win32.txt", dst="licenses.txt") | 162 | self.path(src="licenses-win32.txt", dst="licenses.txt") |
163 | 163 | ||
164 | self.path("featuretable.txt") | 164 | self.path("featuretable.txt") |