From 80eb4f44caf843503bf8f7f5488005af18da1c80 Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sun, 10 Oct 2010 14:05:42 +0200
Subject: [PATCH 1/2] Fixed "Position aircraft in air" in dialog. Setting a
 parking position (e.g. by default via command-line) caused "Position aircraft
 in air" to not work as expected. The "parkpos" property must be reset,
 otherwise heading/glidepath/azimuth do not have any effect when
 repositioning.

---
 gui/dialogs/location-in-air.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml
index 63e104414..ce16f3fae 100644
--- a/gui/dialogs/location-in-air.xml
+++ b/gui/dialogs/location-in-air.xml
@@ -260,6 +260,8 @@
       <binding>
         <command>nasal</command>
         <script>
+          setprop("/sim/presets/parkpos", "");
+
           if (!mode.airport.getBoolValue()) {
             setprop("/sim/presets/airport-id", "");
             setprop("/sim/presets/runway", "");

From 5612cd36dde115425da9e4e35ceb7ed1ce7bbc7a Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Mon, 1 Nov 2010 17:47:08 +0100
Subject: [PATCH 2/2] Horse/cow (scenery) culling... Removed since this caused
 severe scenery (un)loading issues with osg. Scenery nodes with too many
 parents cause extreme delays when unloading tiles. => Need a better
 cow/horse-herd implementation! :)

---
 materials.xml | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/materials.xml b/materials.xml
index e3f79bf99..828bc5cdf 100644
--- a/materials.xml
+++ b/materials.xml
@@ -1320,6 +1320,9 @@ Shared parameters for various materials.
     <heading-type>random</heading-type>
    </object>
   </object-group>
+  <!-- Disabled to avoid a tremendous osg performance penalty when
+       deleting scenery tiles, caused by tens of thousands of shared
+       horse/cow objects. Need a better implementation!
   <object-group>
    <range-m>1000</range-m>
    <object>
@@ -1332,7 +1335,7 @@ Shared parameters for various materials.
     <coverage-m2>300000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
-  </object-group>
+  </object-group> -->
   <wood-coverage>1000000.0</wood-coverage>
   <wood-size>20000.0</wood-size>
   <tree-density>4000.0</tree-density>
@@ -1383,6 +1386,9 @@ Shared parameters for various materials.
     <heading-type>random</heading-type>
    </object>
   </object-group>
+  <!-- Disabled to avoid a tremendous osg performance penalty when
+       deleting scenery tiles, caused by tens of thousands of shared
+       horse/cow objects. Need a better implementation!
   <object-group>
    <range-m>1000</range-m>
    <object>
@@ -1395,7 +1401,7 @@ Shared parameters for various materials.
     <coverage-m2>300000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
-  </object-group>
+  </object-group> -->
   <wood-coverage>500000.0</wood-coverage>
   <tree-texture>Textures/Trees/mixed-summer.png</tree-texture>
   <tree-varieties>8</tree-varieties>
@@ -1444,6 +1450,9 @@ Shared parameters for various materials.
     <heading-type>random</heading-type>
    </object>
   </object-group>
+  <!-- Disabled to avoid a tremendous osg performance penalty when
+       deleting scenery tiles, caused by tens of thousands of shared
+       horse/cow objects. Need a better implementation!
   <object-group>
    <range-m>1000</range-m>
    <object>
@@ -1456,7 +1465,7 @@ Shared parameters for various materials.
     <coverage-m2>300000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
-  </object-group>
+  </object-group> -->
   <wood-coverage>500000.0</wood-coverage>
   <wood-size>20000.0</wood-size>
   <tree-density>5000.0</tree-density>
@@ -2140,6 +2149,9 @@ Shared parameters for various materials.
     <heading-type>random</heading-type>
    </object>
   </object-group>
+  <!-- Disabled to avoid a tremendous osg performance penalty when
+       deleting scenery tiles, caused by tens of thousands of shared
+       horse/cow objects. Need a better implementation!
   <object-group>
    <range-m>1000</range-m>
    <object>
@@ -2152,7 +2164,7 @@ Shared parameters for various materials.
     <coverage-m2>300000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
-  </object-group>
+  </object-group> -->
   <wood-coverage>1000000.0</wood-coverage>
   <wood-size>20000.0</wood-size>
   <tree-density>4000.0</tree-density>
@@ -2202,6 +2214,9 @@ Shared parameters for various materials.
     <heading-type>random</heading-type>
    </object>
   </object-group>
+  <!-- Disabled to avoid a tremendous osg performance penalty when
+       deleting scenery tiles, caused by tens of thousands of shared
+       horse/cow objects. Need a better implementation!
   <object-group>
    <range-m>1000</range-m>
    <object>
@@ -2214,7 +2229,7 @@ Shared parameters for various materials.
     <coverage-m2>300000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
-  </object-group>
+  </object-group> -->
   <wood-coverage>150000.0</wood-coverage>
   <wood-size>10000.0</wood-size>
   <tree-density>5000.0</tree-density>
@@ -2264,6 +2279,9 @@ Shared parameters for various materials.
     <heading-type>random</heading-type>
    </object>
   </object-group>
+  <!-- Disabled to avoid a tremendous osg performance penalty when
+       deleting scenery tiles, caused by tens of thousands of shared
+       horse/cow objects. Need a better implementation!
   <object-group>
    <range-m>1000</range-m>
    <object>
@@ -2276,7 +2294,7 @@ Shared parameters for various materials.
     <coverage-m2>300000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
-  </object-group>
+  </object-group> -->
   <wood-coverage>150000.0</wood-coverage>
   <wood-size>10000.0</wood-size>
   <tree-density>5000.0</tree-density>