Merge branch 'master' into V2Renderer

indra/newview/app_settings/settings.xml

@@ -1894,10 +1894,10 @@
         <integer>0</integer>
       </array>
     </map>
-    <key>BeaconAlwaysOn</key>
+    <key>ShowBeaconsFloater</key>
     <map>
       <key>Comment</key>
-      <string>Beacons / highlighting always on</string>
+      <string>Show beacons floater</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -1905,6 +1905,28 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>BeaconsKeepVisible</key>
+    <map>
+      <key>Comment</key>
+      <string>Don't turn off BeaconsVisible when beacons floater is closed</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>BeaconsVisible</key>
+    <map>
+      <key>Comment</key>
+      <string>Show beacons / highlighting</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>BrowserHomePage</key>
     <map>
       <key>Comment</key>
@@ -14724,6 +14746,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>keepbeacons</key>
+    <map>
+      <key>Comment</key>
+      <string>Keep beacons when closing floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>LogTextureDownloadsToViewerLog</key>
     <map>
       <key>Comment</key>