From b48a16ee82dbd188c5cd765a5b1770c469d08a2e Mon Sep 17 00:00:00 2001 From: narv Date: Sun, 20 Feb 2011 14:47:16 -0700 Subject: [PATCH 1/2] copy over current supported skins on Darwin --- indra/newview/viewer_manifest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7e1266a92..248c81a86 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -528,7 +528,8 @@ class DarwinManifest(ViewerManifest): self.end_prefix("llplugin") # skins - self.path("skins") + self.path("skins/default", "skins/default") + self.path("skins/dark", "skins/dark") # 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") From a5f7c3f7cd0b19ba03d363fe24ddead33c86b7bd Mon Sep 17 00:00:00 2001 From: narv Date: Sun, 20 Feb 2011 23:19:31 -0700 Subject: [PATCH 2/2] er, copy of skins in darwin manifest not needed --- indra/newview/viewer_manifest.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 248c81a86..6e0dfff70 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -525,11 +525,7 @@ class DarwinManifest(ViewerManifest): self.path("../media_plugins/webkit/" + self.args['configuration'] + "/media_plugin_webkit.dylib", "media_plugin_webkit.dylib") self.path("../../libraries/universal-darwin/lib_release/libllqtwebkit.dylib", "libllqtwebkit.dylib") - self.end_prefix("llplugin") - - # skins - self.path("skins/default", "skins/default") - self.path("skins/dark", "skins/dark") + self.end_prefix("llplugin") # 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")