diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/Environment/Modules/TreePopulatorModule.cs | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Region/Environment/Modules/TreePopulatorModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/TreePopulatorModule.cs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs index ec977ba..2051a0f 100644 --- a/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs +++ b/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs | |||
@@ -27,10 +27,13 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
31 | using System.Timers; | ||
32 | using Axiom.Math; | ||
30 | using libsecondlife; | 33 | using libsecondlife; |
34 | using log4net; | ||
31 | using Nini.Config; | 35 | using Nini.Config; |
32 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Console; | ||
34 | using OpenSim.Region.Environment.Interfaces; | 37 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Scenes; | 38 | using OpenSim.Region.Environment.Scenes; |
36 | 39 | ||
@@ -42,7 +45,7 @@ namespace OpenSim.Region.Environment.Modules | |||
42 | public class TreePopulatorModule : IRegionModule | 45 | public class TreePopulatorModule : IRegionModule |
43 | { | 46 | { |
44 | private Scene m_scene; | 47 | private Scene m_scene; |
45 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 49 | ||
47 | private List<LLUUID> m_trees; | 50 | private List<LLUUID> m_trees; |
48 | 51 | ||
@@ -63,8 +66,8 @@ namespace OpenSim.Region.Environment.Modules | |||
63 | 66 | ||
64 | m_scene.EventManager.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(EventManager_OnPluginConsole); | 67 | m_scene.EventManager.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(EventManager_OnPluginConsole); |
65 | 68 | ||
66 | System.Timers.Timer CalculateTrees = new System.Timers.Timer(m_tree_updates); | 69 | Timer CalculateTrees = new Timer(m_tree_updates); |
67 | CalculateTrees.Elapsed += new System.Timers.ElapsedEventHandler(CalculateTrees_Elapsed); | 70 | CalculateTrees.Elapsed += new ElapsedEventHandler(CalculateTrees_Elapsed); |
68 | CalculateTrees.Start(); | 71 | CalculateTrees.Start(); |
69 | m_log.Debug("[TREES]: Initialised tree module"); | 72 | m_log.Debug("[TREES]: Initialised tree module"); |
70 | } | 73 | } |
@@ -168,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules | |||
168 | } | 171 | } |
169 | else | 172 | else |
170 | { | 173 | { |
171 | selectedTree.SetText(killLikelyhood.ToString(), new Axiom.Math.Vector3(1.0f, 1.0f, 1.0f), 1.0); | 174 | selectedTree.SetText(killLikelyhood.ToString(), new Vector3(1.0f, 1.0f, 1.0f), 1.0); |
172 | } | 175 | } |
173 | } | 176 | } |
174 | else | 177 | else |
@@ -217,7 +220,7 @@ namespace OpenSim.Region.Environment.Modules | |||
217 | tree.SendGroupFullUpdate(); | 220 | tree.SendGroupFullUpdate(); |
218 | } | 221 | } |
219 | 222 | ||
220 | void CalculateTrees_Elapsed(object sender, System.Timers.ElapsedEventArgs e) | 223 | void CalculateTrees_Elapsed(object sender, ElapsedEventArgs e) |
221 | { | 224 | { |
222 | growTrees(); | 225 | growTrees(); |
223 | seedTrees(); | 226 | seedTrees(); |