From f440829158cb6a78322d13237b00a08c6437705f Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 9 Mar 2009 23:56:20 -0500
Subject: Mac app icon will be called viewer.icns instead of secondlife.icns

---
 ChangeLog.txt                              | 10 ++++++++++
 linden/indra/newview/CMakeLists.txt        |  4 ++--
 linden/indra/newview/Info-Imprudence.plist |  2 +-
 linden/indra/newview/viewer_manifest.py    |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index c3878ab..81cea37 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,13 @@
+2009-03-09  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/newview/CMakeLists.txt: 
+	Mac app icon will be called viewer.icns instead of secondlife.icns.
+	* linden/indra/newview/Info-Imprudence.plist: 
+	Ditto.
+	* linden/indra/newview/viewer_manifest.py:
+	Ditto.
+
+
 2009-03-08  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/llmedia/llmediaimplgstreamer.cpp:
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1e48d28..2bda223 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -849,7 +849,7 @@ if (DARWIN)
 
   # Add resource files to the project.
   set(viewer_RESOURCE_FILES
-    secondlife.icns
+    viewer.icns
     macview.r
     gpu_table.txt
     Info-Imprudence.plist
@@ -1447,7 +1447,7 @@ if (DARWIN)
     PROPERTIES
     OUTPUT_NAME "${product}"
     MACOSX_BUNDLE_INFO_STRING "info string - localize me"
-    MACOSX_BUNDLE_ICON_FILE "secondlife.icns"
+    MACOSX_BUNDLE_ICON_FILE "viewer.icns"
     MACOSX_BUNDLE_GUI_IDENTIFIER "Imprudence"
     MACOSX_BUNDLE_LONG_VERSION_STRING "ververver"
     MACOSX_BUNDLE_BUNDLE_NAME "Imprudence"
diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist
index 32bba70..357d171 100644
--- a/linden/indra/newview/Info-Imprudence.plist
+++ b/linden/indra/newview/Info-Imprudence.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Imprudence</string>
 	<key>CFBundleIconFile</key>
-	<string>secondlife.icns</string>
+	<string>viewer.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.secondlife.indra.viewer</string>
 	<key>CFBundleInfoDictionaryVersion</key>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index ba4c8a2..acc7fba 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -432,7 +432,7 @@ class DarwinManifest(ViewerManifest):
                 self.path("featuretable_mac.txt")
                 self.path("SecondLife.nib")
 
-                self.path("secondlife.icns")
+                self.path("viewer.icns")
                 
                 # Translations
                 self.path("English.lproj")
-- 
cgit v1.1