QAR-782 Merge featurettes batch #2

merge featurettes-6-merge-2 -> release
dataserver-is-deprecated

1 files changed, 88 insertions, 72 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fd4f293d66..120c2b7ab1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -23,6 +23,22 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>UserChatColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of your chat messages</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.0196078431372</real>
+                <real>0.6862745098039</real>
+                <real>0.9803921568627</real>
+                <real>1</real>
+            </array>
+        </map>
     <key>AgentChatColor</key>
     <map>
       <key>Comment</key>
@@ -1090,16 +1106,16 @@
       <real>0.5</real>
     </map>
     <key>ChatFontSize</key>
-        <map>
-        <key>Comment</key>
-            <string>Size of chat text in chat console (0 = small, 1 = medium, 2 = big)</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>S32</string>
-        <key>Value</key>
-            <integer>1</integer>
-        </map>
+    <map>
+      <key>Comment</key>
+      <string>Size of chat text in chat console (0 = small, 1 = big)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>ChatFullWidth</key>
     <map>
       <key>Comment</key>
@@ -1134,16 +1150,16 @@
       <integer>1</integer>
     </map>
     <key>ChatPersistTime</key>
-        <map>
-        <key>Comment</key>
-            <string>Time for which chat stays visible in console (seconds)</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>F32</string>
-        <key>Value</key>
-            <real>20</real>
-        </map>
+    <map>
+      <key>Comment</key>
+      <string>Time for which chat stays visible in console (seconds)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>20.0</real>
+    </map>
     <key>ChatShowTimestamps</key>
     <map>
       <key>Comment</key>
@@ -1867,16 +1883,16 @@
       <integer>0</integer>
     </map>
     <key>ConsoleBackgroundOpacity</key>
-        <map>
-        <key>Comment</key>
-            <string>Opacity of chat console (0.0 = completely transparent, 1.0 = completely opaque)</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>F32</string>
-        <key>Value</key>
-            <real>0.700</real>
-        </map>
+    <map>
+      <key>Comment</key>
+      <string>Opacity of chat console (0.0 = completely transparent, 1.0 = completely opaque)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.700</real>
+    </map>
     <key>ConsoleBufferSize</key>
     <map>
       <key>Comment</key>
@@ -2605,7 +2621,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>speaker_name</string>
+      <string>speaking_status</string>
     </map>
     <key>FloaterAdvancedSkyRect</key>
     <map>
@@ -4505,17 +4521,6 @@
       <key>Value</key>
       <real>128.0</real>
     </map>
-    <key>MapShowClassifieds</key>
-    <map>
-      <key>Comment</key>
-      <string>Show locations associated with classified ads on world map</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>MapShowEvents</key>
     <map>
       <key>Comment</key>
@@ -5049,21 +5054,21 @@
       <integer>0</integer>
     </map>
     <key>ObjectChatColor</key>
-        <map>
-        <key>Comment</key>
-            <string>Color of chat messages from objects</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Color4</string>
-        <key>Value</key>
-            <array>
-                <real>1</real>
-                <real>0.5</real>
-                <real>0.0</real>
-                <real>1</real>
-            </array>
-        </map>
+    <map>
+      <key>Comment</key>
+      <string>Color of chat messages from objects</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Color4</string>
+      <key>Value</key>
+      <array>
+        <real>1</real>
+        <real>0.5</real>
+        <real>0.0</real>
+        <real>1</real>
+      </array>
+    </map>
     <key>OpenDebugStatAdvanced</key>
     <map>
       <key>Comment</key>
@@ -7056,17 +7061,28 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>ShowObjectUpdates</key>
+    <key>ShowInInventory</key>
         <map>
         <key>Comment</key>
-            <string>Show when update messages are received for individual objects</string>
+            <string>Automatically opens inventory to show accepted objects</string>
         <key>Persist</key>
-            <integer>0</integer>
+            <integer>1</integer>
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>0</integer>
+            <integer>1</integer>
         </map>
+    <key>ShowObjectUpdates</key>
+    <map>
+      <key>Comment</key>
+      <string>Show when update messages are received for individual objects</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ShowOverlayTitle</key>
     <map>
       <key>Comment</key>
@@ -7393,6 +7409,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SnapshotFormat</key>
+    <map>
+      <key>Comment</key>
+      <string>Save snapshots in this format (0 = PNG, 1 = JPEG, 2 = BMP)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>  
     <key>SnapshotLocalLastResolution</key>
     <map>
       <key>Comment</key>
@@ -7404,17 +7431,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>SnapshotFormat</key>
-        <map>
-        <key>Comment</key>
-            <string>Save snapshots in this format (0 = PNG, 1 = JPEG, 2 = BMP)</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>S32</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
     <key>SnapshotPostcardLastResolution</key>
     <map>
       <key>Comment</key>