From 7a64aad1def1b0612addbf2e66c66db061d7e182 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxie@lindenlab.com>
Date: Thu, 9 Jul 2009 20:56:23 +0000
Subject: DEV-34822 - merge 1.23 merge -r119443 - basic slurl handling ignore
 dead branch

---
 indra/newview/Info-SecondLife.plist | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'indra/newview/Info-SecondLife.plist')

diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 38ebb22b84..a800f4ba79 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -18,6 +18,33 @@
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+        <key>CFBundleDocumentTypes</key>
+        <array>
+                <dict>
+                        <key>CFBundleTypeExtensions</key>
+                        <array>
+                                <string>slurl</string>
+                        </array>
+                        <key>CFBundleTypeIconFile</key>
+                        <string>seconlife</string>
+                        <key>CFBundleTypeMIMETypes</key>
+                        <array>
+                                <string>application/x-grid-location-info</string>
+                        </array>
+                        <key>CFBundleTypeName</key>
+                        <string>Secondlife SLURL</string>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+			  <string>SLRL</string>
+			</array>
+                        <key>CFBundleTypeRole</key>
+                        <string>Viewer</string>
+                        <key>LSTypeIsPackage</key>
+			<true/>
+                        <key>NSDocumentClass</key>
+                        <string>SecondLifeSLURL</string>
+                </dict>
+        </array>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -26,6 +53,7 @@
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>secondlife</string>
+				<string>x-grid-location-info</string>
 			</array>
 			<key>LSIsAppleDefaultForScheme</key>
 			<true/>
-- 
cgit v1.2.3


From ac271e1d50bd601d9fbf18655596fa695b80dec0 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Wed, 31 Mar 2010 15:24:42 -0700
Subject: Include channel names in update_version_files.py invocation to fix
 bad viewer channel name.

---
 indra/newview/Info-SecondLife.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/Info-SecondLife.plist')

diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 38ebb22b84..4cb01a0f33 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.0.200030</string>
+	<string>2.0.0.203110</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
-- 
cgit v1.2.3


From 0bb3f144c0a6712a269246975635962b3b5f48d0 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 7 Apr 2010 10:37:07 +0100
Subject: Backed out changeset 63b699f90efd

---
 indra/newview/Info-SecondLife.plist | 28 ----------------------------
 1 file changed, 28 deletions(-)

(limited to 'indra/newview/Info-SecondLife.plist')

diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 7436c5642e..4cb01a0f33 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -18,33 +18,6 @@
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
-        <key>CFBundleDocumentTypes</key>
-        <array>
-                <dict>
-                        <key>CFBundleTypeExtensions</key>
-                        <array>
-                                <string>slurl</string>
-                        </array>
-                        <key>CFBundleTypeIconFile</key>
-                        <string>seconlife</string>
-                        <key>CFBundleTypeMIMETypes</key>
-                        <array>
-                                <string>application/x-grid-location-info</string>
-                        </array>
-                        <key>CFBundleTypeName</key>
-                        <string>Secondlife SLURL</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-			  <string>SLRL</string>
-			</array>
-                        <key>CFBundleTypeRole</key>
-                        <string>Viewer</string>
-                        <key>LSTypeIsPackage</key>
-			<true/>
-                        <key>NSDocumentClass</key>
-                        <string>SecondLifeSLURL</string>
-                </dict>
-        </array>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -53,7 +26,6 @@
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>secondlife</string>
-				<string>x-grid-location-info</string>
 			</array>
 			<key>LSIsAppleDefaultForScheme</key>
 			<true/>
-- 
cgit v1.2.3