From c166704c816629f6b1bde45148f13bdafd0ddcb4 Mon Sep 17 00:00:00 2001 From: November Date: Mon, 27 Sep 2010 00:19:16 -0700 Subject: [PATCH] Forgot a single file. Affects Mac only. --- indra/newview/viewer_manifest.py | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2392f4b0e..9fcc3d074 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -443,7 +443,7 @@ class DarwinManifest(ViewerManifest): self.path(self.args['configuration'] + "/" + self.app_name() + ".app", dst="") if self.prefix(src="", dst="Contents"): # everything goes in Contents - self.path(self.info_plist_name(), dst="Info.plist") + self.path(self.info_plist_name(), dst="Info-Ascent.plist") # copy additional libs in /Contents/MacOS/ self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib") @@ -460,15 +460,7 @@ class DarwinManifest(ViewerManifest): self.path("featuretable_mac.txt") self.path("SecondLife.nib") - if self.viewer_branding_id()=='secondlife': - # If we are not using the default channel, use the 'Firstlook - # icon' to show that it isn't a stable release. - if self.default_channel() and self.default_grid(): - self.path("secondlife.icns") - else: - self.path("secondlife_firstlook.icns", "secondlife.icns") - elif self.viewer_branding_id()=="snowglobe": - self.path("snowglobe.icns") + self.path("Ascent.icns") # Translations self.path("English.lproj") @@ -495,17 +487,6 @@ class DarwinManifest(ViewerManifest): self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib") self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice") - # need to get the kdu dll from any of the build directories as well - try: - self.path(self.find_existing_file('../llkdu/%s/libllkdu.dylib' % self.args['configuration'], - '../../build-darwin-universal-Release/llkdu/Release/libllkdu.dylib', - "../../libraries/universal-darwin/lib_release/libllkdu.dylib"), - dst='libllkdu.dylib') - pass - except: - print "Skipping libllkdu.dylib" - pass - #libfmodwrapper.dylib self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") @@ -524,6 +505,9 @@ class DarwinManifest(ViewerManifest): self.end_prefix("llplugin") + # skins + self.path("skins") + # Per platform MIME config on the cheap. See SNOW-307 / DEV-41388 self.path("skins/default/xui/en-us/mime_types_mac.xml", "skins/default/xui/en-us/mime_types.xml")