Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

indra/newview/app_settings/settings.xml

@@ -696,6 +696,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LiruLegacyLandmarks</key>
+    <map>
+      <key>Comment</key>
+      <string>When creating a new landmark, the legacy format (parcel name, region name (x, y, z)) will be used.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>LiruLegacyOutfitStoreObjChanges</key>
     <map>
       <key>Comment</key>