Merge branch 'master' into presence-refactor

2 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 57ab6ad..ea46945 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -298,6 +298,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public event ObjectBuy OnObjectBuy;
         public event BuyObjectInventory OnBuyObjectInventory;
         public event AgentSit OnUndo;
+        public event AgentSit OnRedo;
+        public event LandUndo OnLandUndo;
 
         public event ForceReleaseControls OnForceReleaseControls;
         public event GodLandStatRequest OnLandStatRequest;
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index 92a205b..3ed338b 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -104,9 +104,9 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
                 this.m_name = field[1].Trim();
                 this.m_frozen = (copsedef[0] == 'F');
                 this.m_tree_quantity = int.Parse(field[2]);
-                this.m_treeline_high = float.Parse(field[3]);
-                this.m_treeline_low = float.Parse(field[4]);
-                this.m_range = double.Parse(field[5]);
+                this.m_treeline_high = float.Parse(field[3], Culture.NumberFormatInfo);
+                this.m_treeline_low = float.Parse(field[4], Culture.NumberFormatInfo);
+                this.m_range = double.Parse(field[5], Culture.NumberFormatInfo);
                 this.m_tree_type = (Tree) Enum.Parse(typeof(Tree),field[6]);
                 this.m_seed_point = Vector3.Parse(field[7]);
                 this.m_initial_scale = Vector3.Parse(field[8]);