diff options
author | Adam Frisby | 2008-05-03 20:00:35 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-03 20:00:35 +0000 |
commit | 87b313792821cb842fd54b568302b6877c4e53f8 (patch) | |
tree | 446719156d1e8d8c12bc3bcd69546f04ba0d79ab /OpenSim/Region/Environment/Modules/World/TreePopulator | |
parent | * Refactor: Move MoveFolder() and PurgeFolder() into CachedUserInfo (which ar... (diff) | |
download | opensim-SC_OLD-87b313792821cb842fd54b568302b6877c4e53f8.zip opensim-SC_OLD-87b313792821cb842fd54b568302b6877c4e53f8.tar.gz opensim-SC_OLD-87b313792821cb842fd54b568302b6877c4e53f8.tar.bz2 opensim-SC_OLD-87b313792821cb842fd54b568302b6877c4e53f8.tar.xz |
* Cleaned up code in Terrain, Tree and Map modules.
* Fixed a bug with Terragen loader where it would do bad things on a non 256x256 sized terrain. Now loads the array correctly.
* Moved MapImageModule.cs to Modules/World/WorldMap
* Changed Location.RegionHandle to use Helpers.GetUlong instead of doing it ourselves.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs index 4b22700..a62b78a 100644 --- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs | |||
@@ -66,10 +66,10 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator | |||
66 | m_trees = new List<LLUUID>(); | 66 | m_trees = new List<LLUUID>(); |
67 | m_scene = scene; | 67 | m_scene = scene; |
68 | 68 | ||
69 | m_scene.EventManager.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(EventManager_OnPluginConsole); | 69 | m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; |
70 | 70 | ||
71 | Timer CalculateTrees = new Timer(m_tree_updates); | 71 | Timer CalculateTrees = new Timer(m_tree_updates); |
72 | CalculateTrees.Elapsed += new ElapsedEventHandler(CalculateTrees_Elapsed); | 72 | CalculateTrees.Elapsed += CalculateTrees_Elapsed; |
73 | CalculateTrees.Start(); | 73 | CalculateTrees.Start(); |
74 | m_log.Debug("[TREES]: Initialised tree module"); | 74 | m_log.Debug("[TREES]: Initialised tree module"); |
75 | } | 75 | } |
@@ -190,10 +190,7 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator | |||
190 | 190 | ||
191 | break; | 191 | break; |
192 | } | 192 | } |
193 | else | 193 | selectedTree.SetText(killLikelyhood.ToString(), new Vector3(1.0f, 1.0f, 1.0f), 1.0); |
194 | { | ||
195 | selectedTree.SetText(killLikelyhood.ToString(), new Vector3(1.0f, 1.0f, 1.0f), 1.0); | ||
196 | } | ||
197 | } | 194 | } |
198 | else | 195 | else |
199 | { | 196 | { |