Merge branch 'merge-1.21.6' into rebranding

Conflicts:
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llappviewer.cpp

3 files changed, 54 insertions, 0 deletions

diff --git a/linden/indra/mac_crash_logger/CrashReporter.nib/classes.nib b/linden/indra/mac_crash_logger/CrashReporter.nib/classes.nib
new file mode 100644
index 0000000..c4b887e
--- /dev/null
+++ b/linden/indra/mac_crash_logger/CrashReporter.nib/classes.nib
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>IBVersion</key>
+        <string>1</string>
+</dict>
+</plist>
diff --git a/linden/indra/mac_crash_logger/CrashReporter.nib/info.nib b/linden/indra/mac_crash_logger/CrashReporter.nib/info.nib
new file mode 100644
index 0000000..b541744
--- /dev/null
+++ b/linden/indra/mac_crash_logger/CrashReporter.nib/info.nib
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>IBFramework Version</key>
+        <string>629</string>
+        <key>IBLastKnownRelativeProjectPath</key>
+        <string>../macview.xcodeproj</string>
+        <key>IBOldestOS</key>
+        <integer>5</integer>
+        <key>IBOpenObjects</key>
+        <array>
+                <integer>193</integer>
+        </array>
+        <key>IBSystem Version</key>
+        <string>9B18</string>
+        <key>targetFramework</key>
+        <string>IBCarbonFramework</string>
+</dict>
+</plist>
diff --git a/linden/indra/mac_crash_logger/Info.plist b/linden/indra/mac_crash_logger/Info.plist
new file mode 100644
index 0000000..f48293e
--- /dev/null
+++ b/linden/indra/mac_crash_logger/Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>English</string>
+        <key>CFBundleExecutable</key>
+        <string>mac-crash-logger</string>
+        <key>CFBundleGetInfoString</key>
+        <string></string>
+        <key>CFBundleIconFile</key>
+        <string></string>
+        <key>CFBundleIdentifier</key>
+        <string>com.secondlife.indra.crashreporter</string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>6.0</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string></string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string>1.0.0</string>
+</dict>
+</plist>