* Cruft removal step #1. Cleaning Modules directory.

4 files changed, 3 insertions, 7 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs
index 1dd923a..9c2fedc 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs
@@ -27,7 +27,6 @@
 using System.Drawing;

 using System.Drawing.Imaging;

 using OpenSim.Region.Environment.Interfaces;

-using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;

 

 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

 {

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs
index 07072be..2925c7d 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs
@@ -27,7 +27,6 @@
 using System.Drawing;

 using System.Drawing.Imaging;

 using OpenSim.Region.Environment.Interfaces;

-using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;

 

 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

 {

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs
index d206763..3a137ae 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs
@@ -27,7 +27,6 @@
 using System.Drawing;

 using System.Drawing.Imaging;

 using OpenSim.Region.Environment.Interfaces;

-using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;

 

 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

 {

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
index cf85aa4..09c3117 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
@@ -35,7 +35,6 @@ using Nini.Config;
 using OpenSim.Framework;

 using OpenSim.Region.Environment.Interfaces;

 using OpenSim.Region.Environment.Modules.Framework;

-using OpenSim.Region.Environment.Modules.World.Terrain;

 using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;

 using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;

 using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;

@@ -79,9 +78,8 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
         private readonly Dictionary<StandardTerrainEffects, ITerrainPaintableEffect> m_painteffects =

             new Dictionary<StandardTerrainEffects, ITerrainPaintableEffect>();

 

-        private Dictionary<Location, ITerrainChannel> m_channels;

-

         private ITerrainChannel m_channel;

+        private Dictionary<Location, ITerrainChannel> m_channels;

         private Dictionary<string, ITerrainEffect> m_plugineffects;

         private ITerrainChannel m_revert;

         private Scene m_scene;

@@ -252,7 +250,8 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
                                 {

                                     m_plugineffects.Add(pluginType.Name, terEffect);

                                     m_log.Info("E ... " + pluginType.Name);

-                                } else

+                                }

+                                else

                                 {

                                     m_log.Warn("E ... " + pluginType.Name + " (Already added)");

                                 }