From 7a6e41d6189eac43cb552670cacf2d123cdcfb58 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 1 Nov 2008 20:10:08 -0500 Subject: Package up Imprudence icons. --- ChangeLog.txt | 5 +++++ linden/indra/newview/CMakeLists.txt | 2 +- linden/indra/newview/viewer_manifest.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 030b3d3..4df3539 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,10 @@ 2008-11-01 Jacek Antonelli + * linden/indra/newview/CMakeLists.txt: + Package up Imprudence icons. + * linden/indra/newview/viewer_manifest.py: + Ditto. + * linden/indra/newview/res/imprudence_icon.png Imported Imprudence icon graphics. * linden/indra/newview/res-sdl/imprudence_icon.BMP diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index e5b6229..ddf6897 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -918,6 +918,7 @@ if (WINDOWS) res/bitmap2.bmp res/circleandline.cur res/icon1.ico + res/imprudence_icon.png res/install_icon.BMP res/install_icon.ico res/llarrow.cur @@ -939,7 +940,6 @@ if (WINDOWS) res/lltooltranslate.cur res/lltoolzoomin.cur res/lltoolzoomout.cur - res/ll_icon.BMP res/ll_icon.ico res/loginbackground.bmp res/resource.h diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 303512f..887dacd 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -531,7 +531,7 @@ class LinuxManifest(ViewerManifest): def construct(self): super(LinuxManifest, self).construct() self.path("licenses-linux.txt","licenses.txt") - self.path("res/ll_icon.png","secondlife_icon.png") + self.path("res/imprudence_icon.png","imprudence_icon.png") if self.prefix("linux_tools", dst=""): self.path("client-readme.txt","README-linux.txt") #self.path("client-readme-voice.txt","README-linux-voice.txt") -- cgit v1.1