Merge branch 'master' of github-siana:siana/SingularityViewer into future

indra/newview/app_settings/settings.xml

@@ -12383,6 +12383,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SnapshotBtnState</key>
+    <map>
+      <key>Comment</key>
+      <string/>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>SnapshotFormat</key>
     <map>
       <key>Comment</key>
@@ -14326,17 +14337,6 @@
         <integer>473</integer>
       </array>
     </map>
-    <key>RadarListBtnState</key>
-    <map>
-      <key>Comment</key>
-      <string/>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>WindEnabled</key>
     <map>
       <key>Comment</key>

indra/newview/app_settings/settings_files.xml

@@ -61,7 +61,7 @@
             <key>Global</key>
             <map>
               <key>Name</key>
-              <string>settings.xml</string>
+              <string>settings_singularity.xml</string>
               <key>NameFromSetting</key>
               <string>ClientSettingsFile</string>
             </map>
@@ -81,7 +81,7 @@
             <key>PerAccount</key>
             <map>
               <key>Name</key>
-              <string>settings_per_account.xml</string>
+              <string>settings_sg_per_account.xml</string>
             </map>
           </map>
         </map>