aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
diff options
context:
space:
mode:
authorCharles Krinke2009-02-22 20:52:55 +0000
committerCharles Krinke2009-02-22 20:52:55 +0000
commit8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch)
tree96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
parentAllow delivery of object messages gridwide (diff)
downloadopensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip
opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz
opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2
opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.xz
Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
* Added log4net dependency to physxplugin in prebuild.xml. * Added missing m_log fields to classes. * Replaced Console.WriteLine with appropriate m_log.Xxxx * Tested that nant test target runs succesfully. * Tested that local opensim sandbox starts up without errors.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
index 1824231..58b02f9 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
@@ -28,11 +28,15 @@ using System;
28using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes; 28using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Region.CoreModules.World.Terrain.Effects 34namespace OpenSim.Region.CoreModules.World.Terrain.Effects
33{ 35{
34 internal class CookieCutter : ITerrainEffect 36 internal class CookieCutter : ITerrainEffect
35 { 37 {
38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39
36 #region ITerrainEffect Members 40 #region ITerrainEffect Members
37 41
38 public void RunEffect(ITerrainChannel map) 42 public void RunEffect(ITerrainChannel map)
@@ -44,7 +48,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Effects
44 bool[,] smoothMask = new bool[map.Width,map.Height]; 48 bool[,] smoothMask = new bool[map.Width,map.Height];
45 bool[,] allowMask = new bool[map.Width,map.Height]; 49 bool[,] allowMask = new bool[map.Width,map.Height];
46 50
47 Console.WriteLine("S1"); 51 m_log.Info("S1");
48 52
49 // Step one, generate rough mask 53 // Step one, generate rough mask
50 int x, y; 54 int x, y;
@@ -52,7 +56,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Effects
52 { 56 {
53 for (y = 0; y < map.Height; y++) 57 for (y = 0; y < map.Height; y++)
54 { 58 {
55 Console.Write("."); 59 m_log.Info(".");
56 smoothMask[x, y] = true; 60 smoothMask[x, y] = true;
57 allowMask[x,y] = true; 61 allowMask[x,y] = true;
58 62
@@ -71,10 +75,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Effects
71 } 75 }
72 } 76 }
73 77
74 Console.WriteLine("S2"); 78 m_log.Info("S2");
75 //smooth.FloodEffect(map, smoothMask, 4.0); 79 //smooth.FloodEffect(map, smoothMask, 4.0);
76 80
77 Console.WriteLine("S3"); 81 m_log.Info("S3");
78 for (x = 0; x < map.Width; x++) 82 for (x = 0; x < map.Width; x++)
79 { 83 {
80 for (y = 0; y < map.Height; y++) 84 for (y = 0; y < map.Height; y++)