From f9d70c41c9b7e7c0bb1cca184e6b5e99fc75a656 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 8 Mar 2011 12:42:15 -0800
Subject: SOCIAL-652 FIX Decline notification shown to users in minimal skin
 when they click on free one click objects

---
 indra/newview/app_settings/settings.xml         | 13 ++++++++++++-
 indra/newview/app_settings/settings_minimal.xml | 11 +++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3dedf0ddd7..a8e9ca3cc9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12487,5 +12487,16 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-</map>
+    <key>LogInventoryDecline</key>
+    <map>
+      <key>Comment</key>
+      <string>Log in system chat whenever an inventory offer is declined</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+  </map>
 </llsd>
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index 6e0053a3a3..e676f41250 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -325,5 +325,16 @@
       <key>Value</key>
       <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html</string>
     </map>
+    <key>LogInventoryDecline</key>
+    <map>
+      <key>Comment</key>
+      <string>Log in system chat whenever an inventory offer is declined</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
   </map>
 </llsd>
-- 
cgit v1.2.3


From 858b7d36ab1a29c9ed30efefe895f10f9fa65310 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 8 Mar 2011 16:30:58 -0800
Subject: updated how to url

---
 indra/newview/app_settings/settings_minimal.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index e676f41250..77a3f2a1bb 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -61,7 +61,7 @@
         <key>Type</key>
             <string>String</string>
         <key>Value</key>
-            <string>http://interest.secondlife.com/static/viewer/howto/index.html</string>
+            <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/howto/index.html</string>
         </map>
     <key>PreferredMaturity</key>
         <map>
-- 
cgit v1.2.3


From f3e37e047206b909c212a02493be6972fba2c8aa Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 8 Mar 2011 16:47:12 -0800
Subject: SOCIAL-588 WIP All avatar changes using avatar picker are not
 completed and incorrect avatar can be worn disable AIS For minimal skin

---
 indra/newview/app_settings/settings.xml         | 11 +++++++++++
 indra/newview/app_settings/settings_minimal.xml | 11 +++++++++++
 2 files changed, 22 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a8e9ca3cc9..94a49f2cef 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12498,5 +12498,16 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>UseHTTPInventory</key>
+    <map>
+      <key>Comment</key>
+      <string>Allow use of http inventory transfers instead of UDP</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
   </map>
 </llsd>
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index 77a3f2a1bb..b5fb85c929 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -336,5 +336,16 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>UseHTTPInventory</key>
+    <map>
+      <key>Comment</key>
+      <string>Allow use of http inventory transfers instead of UDP</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
   </map>
 </llsd>
-- 
cgit v1.2.3


From 24b254c3934ad13516b1c03bf9799397fb364a81 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 9 Mar 2011 09:56:59 -0800
Subject: updated destination and avatar urls

---
 indra/newview/app_settings/settings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3dedf0ddd7..3fc098f020 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -617,7 +617,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html</string>
+      <string></string>
     </map>
     <key>AvatarBakedTextureUploadTimeout</key>
     <map>
@@ -2566,7 +2566,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/guide.html</string>
+      <string></string>
     </map>
   <key>DisableCameraConstraints</key>
     <map>
-- 
cgit v1.2.3