Merge branch 'master' of gitorious.org:fg/fgdata

Aircraft/Generic/WalkView/walkview.nas

@@ -254,7 +254,7 @@ var makePolylinePath = func (points, width, round_ends = 0) {
     if (size(points) < 2) return nil;
     var ret = LinePlane.new(points[0], points[1], width);
     if (round_ends) {
-        ret = UnionConstraint.new(line,
+        ret = UnionConstraint.new(ret,
                                   CircularXYSurface.new(points[0], width/2));
     }
     for (var i = 2; i < size(points); i += 1) {

Environment/environment.xml

@@ -277,6 +277,11 @@
   </turbulence>
 
   <params>
+    <!-- 
+      valid values for jsbsim-turbulence-model:
+      ttNone, ttStandard, ttBerndt, ttCulp, ttMilspec, ttTustin
+    -->
+    <jsbsim-turbulence-model type="string" userarchive="y">ttMilspec</jsbsim-turbulence-model>
     <metar-max-age-min type="long">240</metar-max-age-min>
     <metar-updates-environment type="bool">true</metar-updates-environment>
     <metar-updates-winds-aloft type="bool">true</metar-updates-winds-aloft>