From b302f15deea0f4f7f5de75bfd3776c17021b6444 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 1 Feb 2008 02:23:35 +0000 Subject: EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release ACTUAL MERGE: merge maint-viewer-3-merge -r 79051 -> release --- indra/newview/viewer_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 6acaabe028..13a8c087b0 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -445,7 +445,7 @@ class LinuxManifest(ViewerManifest): def construct(self): super(LinuxManifest, self).construct() self.path("licenses-linux.txt","licenses.txt") - self.path("res/ll_icon.ico","secondlife.ico") + #self.path("res/ll_icon.ico","secondlife.ico") if self.prefix("linux_tools", ""): self.path("client-readme.txt","README-linux.txt") self.path("client-readme-voice.txt","README-linux-voice.txt") @@ -495,7 +495,7 @@ class Linux_i686Manifest(LinuxManifest): self.end_prefix("res-sdl") self.path("featuretable_linux.txt") - self.path("secondlife-i686.supp") + #self.path("secondlife-i686.supp") self.path("app_settings/mozilla-runtime-linux-i686") -- cgit v1.2.3