From 2411a107e717816629817a9f2fe85d3c7cb254ab Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 18 Apr 2011 14:22:23 -0700
Subject: EXP-628 Inventory floater may be opened by SLApp EXP-630 My
 appearance floater may be opened by SLApp EXP-633 Search floater can be
 opened by SLApps

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b602362cd0..f2a0e5ac19 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12585,6 +12585,39 @@
     <string>Boolean</string>
     <key>Value</key>
     <integer>1</integer>
+  </map>
+  <key>EnableInventory</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable opening inventory from web link</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>EnableSearch</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable opening search from web link</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>EnableAppearance</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable opening appearance from web link</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
   </map>
     <key>SearchFromAddressBar</key>
     <map>
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index 490da2c9d4..bc97ec00e9 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -303,6 +303,39 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>EnableInventory</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable opening inventory from web link</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>EnableSearch</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable opening search from web link</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>EnableAppearance</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable opening appearance from web link</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>DoubleClickShowWorldMap</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 958a0601729dc154dfeb0bd3d54c7aa8e2d5379a Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 20 Apr 2011 11:30:00 -0400
Subject: SH-1384 FIXED AvatarPhysicsTest debug setting does not work

Took out setting, no longer needed.  Was formely restricted to gods.
---
 indra/newview/app_settings/settings.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d98f0da1c2..cac7df56e4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -652,17 +652,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-  <key>AvatarPhysicsTest</key>
-  <map>
-    <key>Comment</key>
-    <string>Simulate continuous physics behavior on all nearby avatars.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
     <key>AvatarSex</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 0bc8b0fd5bd230ce11b47fd4a41ebfa1dc9c27c7 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 20 Apr 2011 16:39:44 -0700
Subject: EXP-670 As a resident I want to be able to communicate with other
 residents using my voice, while still enjoying the streamlined experience of
 basic mode

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

(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 bc97ec00e9..60aecb279c 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -52,7 +52,7 @@
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>0</integer>
+            <integer>1</integer>
         </map>
     <key>HelpURLFormat</key>
         <map>
@@ -124,7 +124,7 @@
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>1</integer>
+            <integer>0</integer>
         </map>
     <key>VoiceDisableMic</key>
         <map>
@@ -133,7 +133,7 @@
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>1</integer>
+            <integer>0</integer>
         </map>
       <key>ScriptsCanShowUI</key>
       <map>
@@ -290,7 +290,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>EnableAvatarShare</key>
     <map>
-- 
cgit v1.2.3


From 8c4555d54fc7c8686ffd139425f4c346576cac50 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 21 Apr 2011 18:04:38 -0700
Subject: Backed out changeset: e7b38729ad6d

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

(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 60aecb279c..bc97ec00e9 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -52,7 +52,7 @@
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>1</integer>
+            <integer>0</integer>
         </map>
     <key>HelpURLFormat</key>
         <map>
@@ -124,7 +124,7 @@
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>0</integer>
+            <integer>1</integer>
         </map>
     <key>VoiceDisableMic</key>
         <map>
@@ -133,7 +133,7 @@
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>0</integer>
+            <integer>1</integer>
         </map>
       <key>ScriptsCanShowUI</key>
       <map>
@@ -290,7 +290,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>EnableAvatarShare</key>
     <map>
-- 
cgit v1.2.3