diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-01 02:23:35 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-01 02:23:35 +0000 |
| commit | b302f15deea0f4f7f5de75bfd3776c17021b6444 (patch) | |
| tree | 7a2842445c8dd6c8537bd9f8d4d171e95b85a845 /indra/newview/viewer_manifest.py | |
| parent | 6ae0a9e2c1ac51385c341ff4a93384950e2e7e40 (diff) | |
EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release
ACTUAL MERGE: merge maint-viewer-3-merge -r 79051 -> release
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 4 |
1 files changed, 2 insertions, 2 deletions
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") |