From 05ee53dea873d2347b2ba179a8d1aef0a036e5cd Mon Sep 17 00:00:00 2001
From: Julian Smith <jules@op59.net>
Date: Fri, 18 Dec 2020 16:58:41 +0000
Subject: [PATCH] Allow control of whether to auto-attach to multiplayer
 carriers.

gui/dialogs/multiplayer.xml: added checkbox.

defaults.xml: default /sim/mp-carriers/auto-attach to false with
userarchive="y".

Multiplayer carrier auto-attach is implemented in
fgaddon/MPCarrier/Systems/MPCarriers.nas.
---
 defaults.xml                |  3 +++
 gui/dialogs/multiplayer.xml | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/defaults.xml b/defaults.xml
index 872a33032..a6a831312 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -887,6 +887,9 @@ Started September 2000 by David Megginson, david@megginson.com
       <adress type="string" userarchive="y">127.0.0.1</adress>
       <port type="int" userarchive="y">45003</port>
     </swift>
+    <mp-carriers>
+      <auto-attach type="bool" userarchive="y"></auto-attach>
+    </mp-carriers>
   </sim>
   <!-- accelerations -->
   <accelerations>
diff --git a/gui/dialogs/multiplayer.xml b/gui/dialogs/multiplayer.xml
index c7c907a88..e9a69a946 100644
--- a/gui/dialogs/multiplayer.xml
+++ b/gui/dialogs/multiplayer.xml
@@ -167,6 +167,20 @@
             </binding>
         </checkbox>
 
+        <checkbox>
+            <row>2</row>
+            <col>1</col>
+            <colspan>2</colspan>
+            <halign>left</halign>
+            <name>mpcarrier-auto-attach</name>
+            <label>Automatically enable AI scenarios and attach to multiplayer carriers</label>
+            <property>/sim/mp-carriers/auto-attach</property>
+            <binding>
+                <command>property-toggle</command>
+                <property>/sim/mp-carriers/auto-attach</property>
+            </binding>
+        </checkbox>
+
         <checkbox>
             <row>4</row>
             <col>1</col>