2 files changed, 19 insertions, 0 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 4e186292f7..7514913d13 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -217,6 +217,14 @@
       <string>NoInventoryLibrary</string>
     </map>
 
+    <key>noninteractive</key>
+    <map>
+      <key>desc</key>
+      <string>Run in semi-headless mode where only login and logout need to work.</string>
+      <key>map-to</key>
+      <string>NonInteractive</string>
+    </map>
+
     <key>nonotifications</key>
     <map>
       <key>desc</key>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b1120c18b2..6ff94e1afd 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7026,6 +7026,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>NonInteractive</key>
+    <map>
+      <key>Comment</key>
+      <string>Run in a semi-headless mode where only logging in and logging out needs to work.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+	  <integer>0</integer>
+    </map>
     <key>NonvisibleObjectsInMemoryTime</key>
     <map>
       <key>Comment</key>