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>

indra/newview/app_settings/settings_ascent.xml

@@ -598,6 +598,17 @@
 			<key>Value</key>
 			<string>/away</string>
 		</map>
+		<key>SinguCmdLineURL</key>
+		<map>
+			<key>Comment</key>
+			<string>Open SLURLS and URLs from chatbar.</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>String</string>
+			<key>Value</key>
+			<string>/open</string>
+		</map>
 		<key>SinguCompleteNameProfiles</key>
 		<map>
 			<key>Comment</key>
@@ -609,6 +620,17 @@
 			<key>Value</key>
 			<boolean>0</boolean>
 		</map>
+		<key>SinguMotionResetsCamera</key>
+		<map>
+			<key>Comment</key>
+			<string>Allow camera to reset when moving.</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>Boolean</string>
+			<key>Value</key>
+			<boolean>1</boolean>
+		</map>
 		<key>UseWebProfiles</key>
 		<map>
 			<key>Comment</key>