Added /sim/aircraft property back in, removed include from

preferences.xml, and added <sim>...</sim> tags back into the *-set.xml
files.  You need the newest FlightGear CVS changes to use together
with these changes.

Aircraft/747-yasim-set.xml

@@ -12,6 +12,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 
 <PropertyList>
 
+ <sim>
+
   <flight-model>yasim</flight-model>
   <aero>747</aero>
   <fuel-fraction>1.0</fuel-fraction>
@@ -29,6 +31,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
    <path><!-- you need to set this --></path>
   </model>
 
+ </sim>
+
 </PropertyList>
 
 

Aircraft/X15-set.xml

@@ -11,6 +11,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
+
+ <sim>
  
   <flight-model>jsb</flight-model>
   <aero>X15</aero>
@@ -34,6 +36,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
   </model_2> 
 -->
 
+ </sim>
+
 </PropertyList>
 
 

Aircraft/a4-yasim-set.xml

@@ -11,6 +11,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
+
+ <sim>
   
   <flight-model>yasim</flight-model>
   <aero>a4</aero>
@@ -27,6 +29,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
   <model>
    <path><!-- you need to set this --></path>
   </model>
+
+ </sim>
   
 </PropertyList>
 

Aircraft/c172-ifr-set.xml

@@ -11,6 +11,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
+
+ <sim>
  
   <flight-model>jsb</flight-model>
   <aero>c172</aero>
@@ -27,6 +29,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
   <model>
    <path>Aircraft/c172/Models/N757/n757.ac</path>
   </model>
+
+ </sim>
  
 </PropertyList>
 

Aircraft/c172-larcsim-set.xml

@@ -11,6 +11,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
+
+ <sim>
  
   <flight-model>larcsim</flight-model>
   <aero>c172</aero>
@@ -27,6 +29,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
   <model>
    <path>Aircraft/c172/Models/N757/n757.ac</path>
   </model>
+
+ </sim>
  
 </PropertyList>
 

Aircraft/c172-set.xml

@@ -11,6 +11,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
+
+ <sim>
  
   <flight-model>jsb</flight-model>
   <aero>c172</aero>
@@ -27,6 +29,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
   <model>
    <path>Aircraft/c172/Models/N757/n757.ac</path>
   </model>
+
+ </sim>
   
 </PropertyList>
 

Aircraft/c172-yasim-set.xml

@@ -11,6 +11,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
+
+ <sim>
  
   <flight-model>yasim</flight-model>
   <aero>c172</aero>
@@ -29,6 +31,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
   <model>
    <path>Aircraft/c172/Models/N757/n757.ac</path>
   </model>
+
+ </sim>
   
 </PropertyList>
 

Aircraft/c310-set.xml

@@ -11,6 +11,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
+
+ <sim>
   
   <flight-model>jsb</flight-model>
   <aero>c310</aero>
@@ -29,6 +31,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
    <path>Aircraft/c310/Models/cessna310r.ac</path>
   </model> 
 
+ </sim>
+
 </PropertyList>
 
 

Aircraft/c310-yasim-set.xml

@@ -11,6 +11,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
+
+ <sim>
  
   <flight-model>yasim</flight-model>
   <aero>c310</aero>
@@ -30,6 +32,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
    <path>Aircraft/c310/Models/cessna310r.ac</path>
   </model> 
 
+ </sim>
+
 </PropertyList>
 
 

Aircraft/shuttle-set.xml

@@ -11,6 +11,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
+
+ <sim>
   
   <flight-model>jsb</flight-model>
   <aero>shuttle</aero>
@@ -27,6 +29,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
   <model>
    <path><!-- you need to set this --></path>
   </model>
+
+ </sim>
  
 </PropertyList>
 

preferences.xml

@@ -11,7 +11,8 @@ Started September 2000 by David Megginson, david@megginson.com
 <PropertyList>
 
  <!-- General simulation preferences -->
- <sim include="Aircraft/c172-set.xml">
+ <sim>
+  <aircraft>c172</aircraft>
   <startup>
    <xsize>800</xsize>
    <ysize>600</ysize>