diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 7a8ecbed38..dc9d0498cb 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1199,13 +1199,19 @@ if (DARWIN)
${COREAUDIO_LIBRARY}
)
+ # Fix the version numbers!
+ configure_files(viewer_GENERATED_PLISTS
+ Info-Firestorm.plist
+ English.lproj/InfoPlist.strings
+ )
+
# Add resource files to the project.
set(viewer_RESOURCE_FILES
phoenix_icon.icns
macview.r
gpu_table.txt
- Info-SecondLife.plist
- SecondLife.nib/
+ Info-Firestorm.plist
+ Firestorm.nib/
# CMake doesn't seem to support Xcode language variants well just yet
English.lproj/InfoPlist.strings
English.lproj/language.txt
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
deleted file mode 100644
index 4bf67b1367..0000000000
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "Second Life";
-
-CFBundleShortVersionString = "Second Life version 2.1.1.0";
-CFBundleGetInfoString = "Second Life version 2.1.1.0, Copyright 2004-2010 Linden Research, Inc.";
-
diff --git a/indra/newview/English.lproj/InfoPlist.strings.in b/indra/newview/English.lproj/InfoPlist.strings.in
new file mode 100644
index 0000000000..a705e2a189
--- /dev/null
+++ b/indra/newview/English.lproj/InfoPlist.strings.in
@@ -0,0 +1,7 @@
+/* Localized versions of Info.plist keys */
+
+CFBundleName = "Firestorm";
+
+CFBundleShortVersionString = "Firestorm version @VERSION_VIEWER_MAJOR@.@VERSION_VIEWER_MINOR@.@VERSION_VIEWER_PATCH@ (@VERSION_BUILD@)";
+CFBundleGetInfoString = "Firestorm version @VERSION_VIEWER_MAJOR@.@VERSION_VIEWER_MINOR@.@VERSION_VIEWER_PATCH@ (@VERSION_BUILD@), Copyright 2010-2011 The Phoenix Viewer Project, Inc.";
+
diff --git a/indra/newview/Firestorm.nib/classes.nib b/indra/newview/Firestorm.nib/classes.nib
new file mode 100644
index 0000000000..c4b887e72b
--- /dev/null
+++ b/indra/newview/Firestorm.nib/classes.nib
@@ -0,0 +1,8 @@
+
+
+
+
+ IBVersion
+ 1
+
+
diff --git a/indra/newview/Firestorm.nib/info.nib b/indra/newview/Firestorm.nib/info.nib
new file mode 100644
index 0000000000..1ae2e84963
--- /dev/null
+++ b/indra/newview/Firestorm.nib/info.nib
@@ -0,0 +1,18 @@
+
+
+
+
+ IBFramework Version
+ 851
+ IBOldestOS
+ 6
+ IBOpenObjects
+
+ 191
+
+ IBSystem Version
+ 10J869
+ targetFramework
+ IBCarbonFramework
+
+
diff --git a/indra/newview/Firestorm.nib/objects.xib b/indra/newview/Firestorm.nib/objects.xib
new file mode 100644
index 0000000000..6bd65b9ea0
--- /dev/null
+++ b/indra/newview/Firestorm.nib/objects.xib
@@ -0,0 +1,259 @@
+
+
diff --git a/indra/newview/Info-Firestorm.plist.in b/indra/newview/Info-Firestorm.plist.in
new file mode 100644
index 0000000000..8d77c8d17d
--- /dev/null
+++ b/indra/newview/Info-Firestorm.plist.in
@@ -0,0 +1,67 @@
+
+
+
+
+ CFBundleDevelopmentRegion
+ English
+ CFBundleExecutable
+ Firestorm
+ CFBundleIconFile
+ phoenix_icon.icns
+ CFBundleIdentifier
+ com.secondlife.indra.viewer
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ Firestorm
+ CFBundlePackageType
+ APPL
+ CFBundleSignature
+ ????
+ CFBundleDocumentTypes
+
+
+ CFBundleTypeExtensions
+
+ slurl
+
+ CFBundleTypeIconFile
+ seconlife
+ CFBundleTypeMIMETypes
+
+ application/x-grid-location-info
+
+ CFBundleTypeName
+ Secondlife SLURL
+ CFBundleTypeOSTypes
+
+ SLRL
+
+ CFBundleTypeRole
+ Viewer
+ LSTypeIsPackage
+
+ NSDocumentClass
+ SecondLifeSLURL
+
+
+ CFBundleURLTypes
+
+
+ CFBundleURLName
+ Second Life URL
+ CFBundleURLSchemes
+
+ secondlife
+ x-grid-location-info
+
+ LSIsAppleDefaultForScheme
+
+
+
+ CFBundleVersion
+ 2.1.1.0
+ CSResourcesFileMapped
+
+
+
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 10cd619dad..fb51f7c857 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -608,7 +608,7 @@ class DarwinManifest(ViewerManifest):
self.path(self.args['configuration'] + "/Firestorm.app", dst="")
if self.prefix(src="", dst="Contents"): # everything goes in Contents
- self.path("Info-SecondLife.plist", dst="Info.plist")
+ self.path("Info-Firestorm.plist", dst="Info.plist")
# copy additional libs in /Contents/MacOS/
self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib")
@@ -625,7 +625,7 @@ class DarwinManifest(ViewerManifest):
self.path("licenses-mac.txt", dst="licenses.txt")
self.path("featuretable_mac.txt")
- self.path("SecondLife.nib")
+ self.path("Firestorm.nib")
self.path("VivoxAUP.txt")
# If we are not using the default channel, use the 'Firstlook
@@ -634,7 +634,7 @@ class DarwinManifest(ViewerManifest):
self.path("phoenix_icon.icns")
else:
self.path("phoenix_icon.icns", "phoenix_icon.icns") # Does nothing, but we could change it to use a beta icon later. - AO
- self.path("SecondLife.nib")
+ self.path("Firestorm.nib")
# Translations
self.path("English.lproj")