* Apply http://opensimulator.org/mantis/view.php?id=3347

* This puts in example [Wind] settings into OpenSim.ini.example to match the patch which introduced those settings from last week
* Thanks maimedleech

2 files changed, 18 insertions, 9 deletions

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index ffa9a50..deb5969 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -47,6 +47,7 @@ Patches
 * CharlieO
 * ChrisDown
 * Chris Yeoh
+* coyled
 * Daedius
 * DoranZemlja
 * daTwitch 
@@ -69,6 +70,7 @@ Patches
 * krtaylor (IBM)
 * lulurun 
 * M.Igarashi
+* maimedleech
 * Mic Bowman
 * mikkopa/_someone - RealXtend
 * Mircea Kitsune
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 39fee58..e4fcc9c 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -687,6 +687,22 @@ InterregionComms = "RESTComms"
     ;update_interval = 100
 
 
+[Wind]
+        ; Enables the wind module.  Default is true
+        enabled = true
+        ; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind.  Default is 1.0
+        strength = 1.0
+        
+
+[Trees]
+    ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
+    ; default is false
+    active_trees = false
+
+    ; Density of tree population
+    tree_density = 1000.0
+
+
 [ScriptEngine.DotNetEngine]
     Enabled = true
 
@@ -1096,15 +1112,6 @@ InterregionComms = "RESTComms"
     broker = "http://broker.place.com/{1}"
 
 
-[Trees]
-    ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
-    ; default is false
-    active_trees = false
-
-    ; Density of tree population
-    tree_density = 1000.0
-
-
 [RegionReady]
     ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
     ; default is false