diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs (renamed from OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/TerrainException.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs) | 10 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs) | 4 |
35 files changed, 42 insertions, 42 deletions
diff --git a/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs b/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs index 8dd7478..f96ab88 100644 --- a/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs | |||
@@ -27,8 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | using OpenSim.Region.Environment.Modules.World.Terrain; | 30 | using OpenSim.Region.CoreModules.World.Terrain; |
31 | using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes; | 31 | using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes; |
32 | 32 | ||
33 | namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects | 33 | namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects |
34 | { | 34 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs index 83246fb..cb8112c 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs | |||
@@ -27,9 +27,9 @@ | |||
27 | using System; | 27 | using System; |
28 | using OpenSim.Region.Framework.Interfaces; | 28 | using OpenSim.Region.Framework.Interfaces; |
29 | using OpenSim.Region.Framework.Scenes; | 29 | using OpenSim.Region.Framework.Scenes; |
30 | using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; | 30 | using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects | 32 | namespace OpenSim.Region.CoreModules.World.Terrain.Effects |
33 | { | 33 | { |
34 | internal class CookieCutter : ITerrainEffect | 34 | internal class CookieCutter : ITerrainEffect |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs index 2082137..da6ee12 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs | |||
@@ -28,7 +28,7 @@ using OpenSim.Framework; | |||
28 | using OpenSim.Region.Framework.Interfaces; | 28 | using OpenSim.Region.Framework.Interfaces; |
29 | using OpenSim.Region.Framework.Scenes; | 29 | using OpenSim.Region.Framework.Scenes; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects | 31 | namespace OpenSim.Region.CoreModules.World.Terrain.Effects |
32 | { | 32 | { |
33 | internal class DefaultTerrainGenerator : ITerrainEffect | 33 | internal class DefaultTerrainGenerator : ITerrainEffect |
34 | { | 34 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs index a8e79d0..4f395b5 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs | |||
@@ -30,7 +30,7 @@ using System.Drawing.Imaging; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | using OpenSim.Region.Framework.Interfaces; | 31 | using OpenSim.Region.Framework.Interfaces; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | 33 | namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders |
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
36 | /// A generic windows bitmap loader. | 36 | /// A generic windows bitmap loader. |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs index b76fe05..cff82d1 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs | |||
@@ -30,7 +30,7 @@ using System.Drawing.Imaging; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | using OpenSim.Region.Framework.Interfaces; | 31 | using OpenSim.Region.Framework.Interfaces; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | 33 | namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders |
34 | { | 34 | { |
35 | internal class GIF : GenericSystemDrawing | 35 | internal class GIF : GenericSystemDrawing |
36 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs index 80873d9..477c73c 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs | |||
@@ -32,7 +32,7 @@ using System.IO; | |||
32 | using OpenSim.Region.Framework.Interfaces; | 32 | using OpenSim.Region.Framework.Interfaces; |
33 | using OpenSim.Region.Framework.Scenes; | 33 | using OpenSim.Region.Framework.Scenes; |
34 | 34 | ||
35 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | 35 | namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// A virtual class designed to have methods overloaded, | 38 | /// A virtual class designed to have methods overloaded, |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs index bea504d..f8e31f8 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs | |||
@@ -31,7 +31,7 @@ using System.Drawing.Imaging; | |||
31 | using System.IO; | 31 | using System.IO; |
32 | using OpenSim.Region.Framework.Interfaces; | 32 | using OpenSim.Region.Framework.Interfaces; |
33 | 33 | ||
34 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | 34 | namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders |
35 | { | 35 | { |
36 | public class JPEG : ITerrainLoader | 36 | public class JPEG : ITerrainLoader |
37 | { | 37 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs index e323e28..a86ae00 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs | |||
@@ -30,7 +30,7 @@ using System.IO; | |||
30 | using OpenSim.Region.Framework.Interfaces; | 30 | using OpenSim.Region.Framework.Interfaces; |
31 | using OpenSim.Region.Framework.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | 33 | namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders |
34 | { | 34 | { |
35 | public class LLRAW : ITerrainLoader | 35 | public class LLRAW : ITerrainLoader |
36 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs index 25967f3..0dea282 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs | |||
@@ -30,7 +30,7 @@ using System.Drawing.Imaging; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | using OpenSim.Region.Framework.Interfaces; | 31 | using OpenSim.Region.Framework.Interfaces; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | 33 | namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders |
34 | { | 34 | { |
35 | internal class PNG : GenericSystemDrawing | 35 | internal class PNG : GenericSystemDrawing |
36 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs index 7aff56a..178104f 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs | |||
@@ -29,7 +29,7 @@ using System.IO; | |||
29 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | 32 | namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders |
33 | { | 33 | { |
34 | public class RAW32 : ITerrainLoader | 34 | public class RAW32 : ITerrainLoader |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs index 0503487..220431f 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs | |||
@@ -30,7 +30,7 @@ using System.Drawing.Imaging; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | using OpenSim.Region.Framework.Interfaces; | 31 | using OpenSim.Region.Framework.Interfaces; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | 33 | namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders |
34 | { | 34 | { |
35 | internal class TIFF : GenericSystemDrawing | 35 | internal class TIFF : GenericSystemDrawing |
36 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs index 44d03e3..426708d 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs | |||
@@ -31,7 +31,7 @@ using System.Text; | |||
31 | using OpenSim.Region.Framework.Interfaces; | 31 | using OpenSim.Region.Framework.Interfaces; |
32 | using OpenSim.Region.Framework.Scenes; | 32 | using OpenSim.Region.Framework.Scenes; |
33 | 33 | ||
34 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | 34 | namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders |
35 | { | 35 | { |
36 | /// <summary> | 36 | /// <summary> |
37 | /// Terragen File Format Loader | 37 | /// Terragen File Format Loader |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs index 4d49a70..fe79c0b 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using OpenSim.Region.Framework.Interfaces; | 28 | using OpenSim.Region.Framework.Interfaces; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes | 30 | namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes |
31 | { | 31 | { |
32 | public class FlattenArea : ITerrainFloodEffect | 32 | public class FlattenArea : ITerrainFloodEffect |
33 | { | 33 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs index 64f9014..5c0aace 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using OpenSim.Region.Framework.Interfaces; | 28 | using OpenSim.Region.Framework.Interfaces; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes | 30 | namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes |
31 | { | 31 | { |
32 | public class LowerArea : ITerrainFloodEffect | 32 | public class LowerArea : ITerrainFloodEffect |
33 | { | 33 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs index 2d44a3a..02f2b53 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs | |||
@@ -29,7 +29,7 @@ using OpenSim.Framework; | |||
29 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes | 32 | namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes |
33 | { | 33 | { |
34 | public class NoiseArea : ITerrainFloodEffect | 34 | public class NoiseArea : ITerrainFloodEffect |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs index 0c7d016..768b31f 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using OpenSim.Region.Framework.Interfaces; | 28 | using OpenSim.Region.Framework.Interfaces; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes | 30 | namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes |
31 | { | 31 | { |
32 | public class RaiseArea : ITerrainFloodEffect | 32 | public class RaiseArea : ITerrainFloodEffect |
33 | { | 33 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs index 3f06d82..66b9055 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using OpenSim.Region.Framework.Interfaces; | 28 | using OpenSim.Region.Framework.Interfaces; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes | 30 | namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes |
31 | { | 31 | { |
32 | public class RevertArea : ITerrainFloodEffect | 32 | public class RevertArea : ITerrainFloodEffect |
33 | { | 33 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs index 3881264..a75dde1 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using OpenSim.Region.Framework.Interfaces; | 28 | using OpenSim.Region.Framework.Interfaces; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes | 30 | namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes |
31 | { | 31 | { |
32 | public class SmoothArea : ITerrainFloodEffect | 32 | public class SmoothArea : ITerrainFloodEffect |
33 | { | 33 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs index 4533e9e..40b9f5a 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using OpenSim.Region.Framework.Interfaces; | 28 | using OpenSim.Region.Framework.Interfaces; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Modules.World.Terrain | 30 | namespace OpenSim.Region.CoreModules.World.Terrain |
31 | { | 31 | { |
32 | public interface ITerrainEffect | 32 | public interface ITerrainEffect |
33 | { | 33 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs index 5bae84b..eee7a83 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.World.Terrain | 31 | namespace OpenSim.Region.CoreModules.World.Terrain |
32 | { | 32 | { |
33 | public interface ITerrainFloodEffect | 33 | public interface ITerrainFloodEffect |
34 | { | 34 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs index 21bda58..c62b897 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System.IO; | 28 | using System.IO; |
29 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.World.Terrain | 31 | namespace OpenSim.Region.CoreModules.World.Terrain |
32 | { | 32 | { |
33 | public interface ITerrainLoader | 33 | public interface ITerrainLoader |
34 | { | 34 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs index 91bc31f..8c5d1d9 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs | |||
@@ -30,7 +30,7 @@ using System.IO; | |||
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Modules.World.Terrain | 33 | namespace OpenSim.Region.CoreModules.World.Terrain |
34 | { | 34 | { |
35 | public interface ITerrainModule | 35 | public interface ITerrainModule |
36 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs index 7461560..15d9f6e 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using OpenSim.Region.Framework.Interfaces; | 28 | using OpenSim.Region.Framework.Interfaces; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Modules.World.Terrain | 30 | namespace OpenSim.Region.CoreModules.World.Terrain |
31 | { | 31 | { |
32 | public interface ITerrainPaintableEffect | 32 | public interface ITerrainPaintableEffect |
33 | { | 33 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs index 4d694cc..6ce6994 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | 32 | namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes |
33 | { | 33 | { |
34 | /// <summary> | 34 | /// <summary> |
35 | /// Hydraulic Erosion Brush | 35 | /// Hydraulic Erosion Brush |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs index 91c030d..928a595 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | 32 | namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes |
33 | { | 33 | { |
34 | public class FlattenSphere : ITerrainPaintableEffect | 34 | public class FlattenSphere : ITerrainPaintableEffect |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs index d391e94..8c40088 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | 31 | namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes |
32 | { | 32 | { |
33 | public class LowerSphere : ITerrainPaintableEffect | 33 | public class LowerSphere : ITerrainPaintableEffect |
34 | { | 34 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs index 32a6869..95a8c33 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs | |||
@@ -30,7 +30,7 @@ using OpenSim.Framework; | |||
30 | using OpenSim.Region.Framework.Interfaces; | 30 | using OpenSim.Region.Framework.Interfaces; |
31 | using OpenSim.Region.Framework.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | 33 | namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes |
34 | { | 34 | { |
35 | public class NoiseSphere : ITerrainPaintableEffect | 35 | public class NoiseSphere : ITerrainPaintableEffect |
36 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs index 86d01d3..1a2528a 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | 32 | namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes |
33 | { | 33 | { |
34 | /// <summary> | 34 | /// <summary> |
35 | /// Speed-Optimised Hybrid Erosion Brush | 35 | /// Speed-Optimised Hybrid Erosion Brush |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs index a0ff262..c53bb7d 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | 32 | namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes |
33 | { | 33 | { |
34 | public class RaiseSphere : ITerrainPaintableEffect | 34 | public class RaiseSphere : ITerrainPaintableEffect |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs index af6d94d..4ed8a13 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | 32 | namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes |
33 | { | 33 | { |
34 | public class RevertSphere : ITerrainPaintableEffect | 34 | public class RevertSphere : ITerrainPaintableEffect |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs index fe270f7..6636d8f 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using OpenSim.Region.Framework.Interfaces; | 28 | using OpenSim.Region.Framework.Interfaces; |
29 | using OpenSim.Region.Framework.Scenes; | 29 | using OpenSim.Region.Framework.Scenes; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | 31 | namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes |
32 | { | 32 | { |
33 | public class SmoothSphere : ITerrainPaintableEffect | 33 | public class SmoothSphere : ITerrainPaintableEffect |
34 | { | 34 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs index faba119..6b00cc8 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using OpenSim.Region.Framework.Interfaces; | 28 | using OpenSim.Region.Framework.Interfaces; |
29 | using OpenSim.Region.Framework.Scenes; | 29 | using OpenSim.Region.Framework.Scenes; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | 31 | namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// Thermal Weathering Paint Brush | 34 | /// Thermal Weathering Paint Brush |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainException.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs index 2411de0..ff9b8ec 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainException.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Modules.World.Terrain | 30 | namespace OpenSim.Region.CoreModules.World.Terrain |
31 | { | 31 | { |
32 | public class TerrainException : Exception | 32 | public class TerrainException : Exception |
33 | { | 33 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index bc601dc..9de7338 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
@@ -35,12 +35,12 @@ using Nini.Config; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander; | 38 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; |
39 | using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders; | 39 | using OpenSim.Region.CoreModules.World.Terrain.FileLoaders; |
40 | using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes; | 40 | using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes; |
41 | using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; | 41 | using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes; |
42 | 42 | ||
43 | namespace OpenSim.Region.Environment.Modules.World.Terrain | 43 | namespace OpenSim.Region.CoreModules.World.Terrain |
44 | { | 44 | { |
45 | public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule | 45 | public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule |
46 | { | 46 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs index 2acd5bc..e7f92d7 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs | |||
@@ -28,9 +28,9 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; | 31 | using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Modules.World.Terrain.Tests | 33 | namespace OpenSim.Region.CoreModules.World.Terrain.Tests |
34 | { | 34 | { |
35 | [TestFixture] | 35 | [TestFixture] |
36 | public class TerrainTest | 36 | public class TerrainTest |