From c817166ebe67cefd02f8c9e3bb9195a6a86fa199 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 23 Jan 2013 14:17:48 -0500
Subject: STORM-68  STORM-68 Remove obsolete menu entry for default uploads.
 Remove two matching entries in settings.xml (the other three were already
 eliminated). Adjust default permissions for new notecards and gestures to
 C/M/T (the current default).

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

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7a3c1df0bc..203f6800aa 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3258,17 +3258,6 @@
       <string>String</string>
       <key>Value</key>
       <string>http://events.secondlife.com/viewer/embed/event/</string>
-    </map>
-    <key>EveryoneCopy</key>
-      <map>
-        <key>Comment</key>
-        <string>Everyone can copy the newly created objects</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>Boolean</string>
-        <key>Value</key>
-        <integer>0</integer>
     </map>
 	<key>FeatureManagerHTTPTable</key>
       <map>
@@ -9509,17 +9498,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ShareWithGroup</key>
-    <map>
-      <key>Comment</key>
-      <string>Newly created objects are shared with the currently active group</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>ShowAdvancedGraphicsSettings</key>
     <map>
       <key>Comment</key>
@@ -13657,7 +13635,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>NotecardsNextOwnerModify</key>
     <map>
@@ -13668,7 +13646,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>NotecardsNextOwnerTransfer</key>
     <map>
@@ -13712,7 +13690,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>GesturesNextOwnerModify</key>
     <map>
@@ -13723,7 +13701,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>GesturesNextOwnerTransfer</key>
     <map>
-- 
cgit v1.2.3