1 files changed, 37 insertions, 15 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 667090d0ab..1432365d38 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -584,17 +584,6 @@
       <key>Value</key>
       <integer>40</integer>
     </map>
-    <key>BeaconAlwaysOn</key>
-    <map>
-      <key>Comment</key>
-      <string>Beacons / highlighting always on</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>BottomPanelNew</key>
     <map>
       <key>Comment</key>
@@ -4593,7 +4582,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>NearMeRange</key>
     <map>
@@ -4760,6 +4749,17 @@
       <key>Value</key>
       <integer>5</integer>
     </map>
+    <key>ToastOpaqueTime</key>
+    <map>
+      <key>Comment</key>
+      <string>Width of notification messages</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>4</integer>
+    </map>
     <key>StartUpToastTime</key>
     <map>
       <key>Comment</key>
@@ -4769,7 +4769,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>10</integer>
+      <integer>5</integer>
     </map>
     <key>ToastMargin</key>
     <map>
@@ -6776,6 +6776,17 @@
     <key>ShowCrosshairs</key>
     <map>
       <key>Comment</key>
+      <string>Show Coordinates in  Location Input Field</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>ShowCoordinatesOption</key>
+    <map>
+      <key>Comment</key>
       <string>Display crosshairs when in mouselook mode</string>
       <key>Persist</key>
       <integer>1</integer>
@@ -7192,7 +7203,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>ShowTangentBasis</key>
     <map>
@@ -8278,7 +8289,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>16</real>
+      <real>15</real>
     </map>
     <key>UISliderctrlHeight</key>
     <map>
@@ -9634,5 +9645,16 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>GroupTeleportMembersLimit</key>
+    <map>
+      <key>Comment</key>
+      <string>Max number of members of group to offer teleport</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>100</integer>
+    </map>
   </map>
 </llsd>