diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/RegionSettingsSerializer.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs) | 8 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs (renamed from OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandChannel.cs (renamed from OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs (renamed from OpenSim/Region/Environment/Modules/World/Land/LandObject.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs (renamed from OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs (renamed from OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs (renamed from OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Sound/SoundModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Sun/SunModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs) | 2 | ||||
-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 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Wind/WindModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs (renamed from OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs (renamed from OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs (renamed from OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs (renamed from OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs (renamed from OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs (renamed from OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs (renamed from OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs (renamed from OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs (renamed from OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs) | 2 |
69 files changed, 91 insertions, 91 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs index 4151c88..179d1a2 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 31 | namespace OpenSim.Region.CoreModules.World.Archiver |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// Constants for the archiving module | 34 | /// Constants for the archiving module |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index b507c52..3218abc 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -38,9 +38,9 @@ using OpenSim.Framework; | |||
38 | using OpenSim.Framework.Communications.Cache; | 38 | using OpenSim.Framework.Communications.Cache; |
39 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | using OpenSim.Region.Environment.Modules.World.Terrain; | 41 | using OpenSim.Region.CoreModules.World.Terrain; |
42 | 42 | ||
43 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 43 | namespace OpenSim.Region.CoreModules.World.Archiver |
44 | { | 44 | { |
45 | /// <summary> | 45 | /// <summary> |
46 | /// Handles an individual archive read request | 46 | /// Handles an individual archive read request |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs index 9a06bf7..d3c2cd1 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs | |||
@@ -35,10 +35,10 @@ using log4net; | |||
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.World.Serialiser; | 38 | using OpenSim.Region.CoreModules.World.Serialiser; |
39 | using OpenSim.Region.Environment.Modules.World.Terrain; | 39 | using OpenSim.Region.CoreModules.World.Terrain; |
40 | 40 | ||
41 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 41 | namespace OpenSim.Region.CoreModules.World.Archiver |
42 | { | 42 | { |
43 | /// <summary> | 43 | /// <summary> |
44 | /// Method called when all the necessary assets for an archive request have been received. | 44 | /// Method called when all the necessary assets for an archive request have been received. |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 56604d6..ee0ec69 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -29,8 +29,8 @@ using OpenSim.Framework; | |||
29 | using OpenSim.Framework.Communications.Cache; | 29 | using OpenSim.Framework.Communications.Cache; |
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 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 32 | using OpenSim.Region.CoreModules.World.Serialiser; |
33 | using OpenSim.Region.Environment.Modules.World.Terrain; | 33 | using OpenSim.Region.CoreModules.World.Terrain; |
34 | using System; | 34 | using System; |
35 | using System.Collections.Generic; | 35 | using System.Collections.Generic; |
36 | using System.IO; | 36 | using System.IO; |
@@ -42,7 +42,7 @@ using OpenMetaverse; | |||
42 | using log4net; | 42 | using log4net; |
43 | using Nini.Config; | 43 | using Nini.Config; |
44 | 44 | ||
45 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 45 | namespace OpenSim.Region.CoreModules.World.Archiver |
46 | { | 46 | { |
47 | /// <summary> | 47 | /// <summary> |
48 | /// Prepare to write out an archive. | 48 | /// Prepare to write out an archive. |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index cd81169..c1f5b18 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -35,9 +35,9 @@ using Nini.Config; | |||
35 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
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.World.Serialiser; | 38 | using OpenSim.Region.CoreModules.World.Serialiser; |
39 | 39 | ||
40 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 40 | namespace OpenSim.Region.CoreModules.World.Archiver |
41 | { | 41 | { |
42 | /// <summary> | 42 | /// <summary> |
43 | /// This module loads and saves OpenSimulator archives | 43 | /// This module loads and saves OpenSimulator archives |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index 36a60f3..76d27ce 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs | |||
@@ -33,7 +33,7 @@ using OpenMetaverse; | |||
33 | using log4net; | 33 | using log4net; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | 35 | ||
36 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 36 | namespace OpenSim.Region.CoreModules.World.Archiver |
37 | { | 37 | { |
38 | /// <summary> | 38 | /// <summary> |
39 | /// Archives assets | 39 | /// Archives assets |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs index 95ff468..f9909d9 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |||
@@ -35,7 +35,7 @@ using log4net; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications.Cache; | 36 | using OpenSim.Framework.Communications.Cache; |
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 38 | namespace OpenSim.Region.CoreModules.World.Archiver |
39 | { | 39 | { |
40 | /// <summary> | 40 | /// <summary> |
41 | /// Dearchives assets | 41 | /// Dearchives assets |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index b7fd170..8971b6e 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Framework.Communications.Cache; | |||
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 | 38 | ||
39 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 39 | namespace OpenSim.Region.CoreModules.World.Archiver |
40 | { | 40 | { |
41 | /// <summary> | 41 | /// <summary> |
42 | /// Encapsulate the asynchronous requests for the assets required for an archive operation | 42 | /// Encapsulate the asynchronous requests for the assets required for an archive operation |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/RegionSettingsSerializer.cs b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs index e12d0ec..2580316 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/RegionSettingsSerializer.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs | |||
@@ -32,7 +32,7 @@ using System.Xml; | |||
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | 34 | ||
35 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 35 | namespace OpenSim.Region.CoreModules.World.Archiver |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// Serialize and deserialize region settings for an archive file format. | 38 | /// Serialize and deserialize region settings for an archive file format. |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs index 3862546..506d770 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs | |||
@@ -31,7 +31,7 @@ using System.Reflection; | |||
31 | using System.Text; | 31 | using System.Text; |
32 | using log4net; | 32 | using log4net; |
33 | 33 | ||
34 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 34 | namespace OpenSim.Region.CoreModules.World.Archiver |
35 | { | 35 | { |
36 | /// <summary> | 36 | /// <summary> |
37 | /// Temporary code to do the bare minimum required to read a tar archive for our purposes | 37 | /// Temporary code to do the bare minimum required to read a tar archive for our purposes |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs index 8fd247c..437939e 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs | |||
@@ -32,7 +32,7 @@ using System.Text; | |||
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using log4net; | 33 | using log4net; |
34 | 34 | ||
35 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 35 | namespace OpenSim.Region.CoreModules.World.Archiver |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// Temporary code to produce a tar archive in tar v7 format | 38 | /// Temporary code to produce a tar archive in tar v7 format |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index e265252..a14e0f6 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -33,13 +33,13 @@ using NUnit.Framework.SyntaxHelpers; | |||
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Environment.Modules.World.Archiver; | 36 | using OpenSim.Region.CoreModules.World.Archiver; |
37 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 37 | using OpenSim.Region.CoreModules.World.Serialiser; |
38 | using OpenSim.Region.Environment.Modules.World.Terrain; | 38 | using OpenSim.Region.CoreModules.World.Terrain; |
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | using OpenSim.Tests.Common.Setup; | 40 | using OpenSim.Tests.Common.Setup; |
41 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests | 42 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests |
43 | { | 43 | { |
44 | [TestFixture] | 44 | [TestFixture] |
45 | public class ArchiverTests | 45 | public class ArchiverTests |
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 6b74c83..8b15308 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Framework; | |||
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Modules.World.Estate | 38 | namespace OpenSim.Region.CoreModules.World.Estate |
39 | { | 39 | { |
40 | public class EstateManagementModule : IEstateModule | 40 | public class EstateManagementModule : IEstateModule |
41 | { | 41 | { |
@@ -458,7 +458,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
458 | TerrainUploader = null; | 458 | TerrainUploader = null; |
459 | } | 459 | } |
460 | remoteClient.SendAlertMessage("Terrain Upload Complete. Loading...."); | 460 | remoteClient.SendAlertMessage("Terrain Upload Complete. Loading...."); |
461 | OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule>(); | 461 | OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>(); |
462 | 462 | ||
463 | if (terr != null) | 463 | if (terr != null) |
464 | { | 464 | { |
@@ -544,7 +544,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
544 | private void handleTerrainRequest(IClientAPI remote_client, string clientFileName) | 544 | private void handleTerrainRequest(IClientAPI remote_client, string clientFileName) |
545 | { | 545 | { |
546 | // Save terrain here | 546 | // Save terrain here |
547 | OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule>(); | 547 | OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>(); |
548 | 548 | ||
549 | if (terr != null) | 549 | if (terr != null) |
550 | { | 550 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs index 267178e..94a4072 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Framework.Communications.Cache; | |||
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | 36 | ||
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Modules.World.Estate | 38 | namespace OpenSim.Region.CoreModules.World.Estate |
39 | { | 39 | { |
40 | 40 | ||
41 | public class EstateTerrainXferHandler | 41 | public class EstateTerrainXferHandler |
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs index 76555d2..41163a0 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs | |||
@@ -32,7 +32,7 @@ using OpenSim.Framework; | |||
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.Land | 35 | namespace OpenSim.Region.CoreModules.World.Land |
36 | { | 36 | { |
37 | public class LandChannel : ILandChannel | 37 | public class LandChannel : ILandChannel |
38 | { | 38 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 58176e4..6ae6576 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -40,7 +40,7 @@ using OpenSim.Framework.Communications.Capabilities; | |||
40 | using OpenSim.Region.Physics.Manager; | 40 | using OpenSim.Region.Physics.Manager; |
41 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; | 41 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; |
42 | 42 | ||
43 | namespace OpenSim.Region.Environment.Modules.World.Land | 43 | namespace OpenSim.Region.CoreModules.World.Land |
44 | { | 44 | { |
45 | // used for caching | 45 | // used for caching |
46 | internal class ExtendedLandData { | 46 | internal class ExtendedLandData { |
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index b5f7225..fc5bef1 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -34,7 +34,7 @@ using OpenSim.Framework; | |||
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | 36 | ||
37 | namespace OpenSim.Region.Environment.Modules.World.Land | 37 | namespace OpenSim.Region.CoreModules.World.Land |
38 | { | 38 | { |
39 | /// <summary> | 39 | /// <summary> |
40 | /// Keeps track of a specific piece of land's information | 40 | /// Keeps track of a specific piece of land's information |
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 8838e39..1469f5d 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -36,10 +36,10 @@ using OpenSim; | |||
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.Environment.Modules.Framework; | 39 | using OpenSim.Region.CoreModules.Framework; |
40 | using OpenSim.Framework.Communications.Cache; | 40 | using OpenSim.Framework.Communications.Cache; |
41 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.World.Permissions | 42 | namespace OpenSim.Region.CoreModules.World.Permissions |
43 | { | 43 | { |
44 | public class PermissionsModule : IRegionModule | 44 | public class PermissionsModule : IRegionModule |
45 | { | 45 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs b/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs index afad3cf..acc7bb8 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using OpenSim.Region.Framework.Scenes; | 28 | using OpenSim.Region.Framework.Scenes; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Modules.World.Serialiser | 30 | namespace OpenSim.Region.CoreModules.World.Serialiser |
31 | { | 31 | { |
32 | internal interface IFileSerialiser | 32 | internal interface IFileSerialiser |
33 | { | 33 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs index 8b3f2ce..ed6448f 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs | |||
@@ -32,7 +32,7 @@ using System.Text; | |||
32 | using System.Xml; | 32 | using System.Xml; |
33 | using OpenSim.Region.Framework.Scenes; | 33 | using OpenSim.Region.Framework.Scenes; |
34 | 34 | ||
35 | namespace OpenSim.Region.Environment.Modules.World.Serialiser | 35 | namespace OpenSim.Region.CoreModules.World.Serialiser |
36 | { | 36 | { |
37 | internal class SerialiseObjects : IFileSerialiser | 37 | internal class SerialiseObjects : IFileSerialiser |
38 | { | 38 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs index d0ce3d8..924218a 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs | |||
@@ -25,11 +25,11 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using OpenSim.Region.Environment.Modules.World.Terrain; | 28 | using OpenSim.Region.CoreModules.World.Terrain; |
29 | using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders; | 29 | using OpenSim.Region.CoreModules.World.Terrain.FileLoaders; |
30 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.World.Serialiser | 32 | namespace OpenSim.Region.CoreModules.World.Serialiser |
33 | { | 33 | { |
34 | internal class SerialiseTerrain : IFileSerialiser | 34 | internal class SerialiseTerrain : IFileSerialiser |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs index 0e7873c..7080d5f 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs | |||
@@ -32,9 +32,9 @@ using OpenMetaverse; | |||
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander; | 35 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; |
36 | 36 | ||
37 | namespace OpenSim.Region.Environment.Modules.World.Serialiser | 37 | namespace OpenSim.Region.CoreModules.World.Serialiser |
38 | { | 38 | { |
39 | public class SerialiserModule : IRegionModule, IRegionSerialiserModule | 39 | public class SerialiserModule : IRegionModule, IRegionSerialiserModule |
40 | { | 40 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 1713797..ffd6b8d 100644 --- a/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | |||
@@ -34,7 +34,7 @@ using OpenSim.Framework; | |||
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | 36 | ||
37 | namespace OpenSim.Region.Environment.World.Sound | 37 | namespace OpenSim.Region.CoreModules.World.Sound |
38 | { | 38 | { |
39 | public class SoundModule : IRegionModule, ISoundModule | 39 | public class SoundModule : IRegionModule, ISoundModule |
40 | { | 40 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs index ee96d58..b36684c 100644 --- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs +++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs | |||
@@ -33,7 +33,7 @@ using OpenSim.Framework; | |||
33 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | 35 | ||
36 | namespace OpenSim.Region.Environment.Modules | 36 | namespace OpenSim.Region.CoreModules |
37 | { | 37 | { |
38 | public class SunModule : IRegionModule | 38 | public class SunModule : IRegionModule |
39 | { | 39 | { |
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 |
diff --git a/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs index 4c4ca0d..8b2bb1e 100644 --- a/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs +++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Framework.Communications.Cache; | |||
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 | 38 | ||
39 | namespace OpenSim.Region.Environment.Modules.Avatar.Vegetation | 39 | namespace OpenSim.Region.CoreModules.Avatar.Vegetation |
40 | { | 40 | { |
41 | public class VegetationModule : IRegionModule, IVegetationModule | 41 | public class VegetationModule : IRegionModule, IVegetationModule |
42 | { | 42 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index 8e54fd9..b8bd605 100644 --- a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs | |||
@@ -33,7 +33,7 @@ using OpenSim.Framework; | |||
33 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | 35 | ||
36 | namespace OpenSim.Region.Environment.Modules | 36 | namespace OpenSim.Region.CoreModules |
37 | { | 37 | { |
38 | public class WindModule : IWindModule | 38 | public class WindModule : IWindModule |
39 | { | 39 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs index cb0ac8c..3684df0 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs | |||
@@ -29,7 +29,7 @@ using System.Drawing; | |||
29 | using OpenSim.Region.Framework.Scenes; | 29 | using OpenSim.Region.Framework.Scenes; |
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment | 32 | namespace OpenSim.Region.CoreModules.World.WorldMap |
33 | { | 33 | { |
34 | public interface IMapTileTerrainRenderer | 34 | public interface IMapTileTerrainRenderer |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs index a806c7d..eea6cf6 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | using OpenMetaverse; | 40 | using OpenMetaverse; |
41 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.World.WorldMap | 42 | namespace OpenSim.Region.CoreModules.World.WorldMap |
43 | { | 43 | { |
44 | public enum DrawRoutine | 44 | public enum DrawRoutine |
45 | { | 45 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index 43ed1e4..45a99a9 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
@@ -36,7 +36,7 @@ using OpenMetaverse; | |||
36 | using log4net; | 36 | using log4net; |
37 | using Nini.Config; | 37 | using Nini.Config; |
38 | 38 | ||
39 | namespace OpenSim.Region.Environment.Modules.World.WorldMap | 39 | namespace OpenSim.Region.CoreModules.World.WorldMap |
40 | { | 40 | { |
41 | public class MapSearchModule : IRegionModule | 41 | public class MapSearchModule : IRegionModule |
42 | { | 42 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs index 7fe538e..b783d7c 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs | |||
@@ -39,7 +39,7 @@ using log4net; | |||
39 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.World.WorldMap | 42 | namespace OpenSim.Region.CoreModules.World.WorldMap |
43 | { | 43 | { |
44 | public class ShadedMapTileRenderer : IMapTileTerrainRenderer | 44 | public class ShadedMapTileRenderer : IMapTileTerrainRenderer |
45 | { | 45 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs index d23c352..537644a 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs | |||
@@ -39,9 +39,9 @@ using OpenMetaverse.Imaging; | |||
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Region.Environment.Modules.World.Terrain; | 42 | using OpenSim.Region.CoreModules.World.Terrain; |
43 | 43 | ||
44 | namespace OpenSim.Region.Environment.Modules.World.WorldMap | 44 | namespace OpenSim.Region.CoreModules.World.WorldMap |
45 | { | 45 | { |
46 | // Hue, Saturation, Value; used for color-interpolation | 46 | // Hue, Saturation, Value; used for color-interpolation |
47 | struct HSV { | 47 | struct HSV { |
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 37b4547..376e365 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -52,7 +52,7 @@ using OSD = OpenMetaverse.StructuredData.OSD; | |||
52 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | 52 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; |
53 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; | 53 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; |
54 | 54 | ||
55 | namespace OpenSim.Region.Environment.Modules.World.WorldMap | 55 | namespace OpenSim.Region.CoreModules.World.WorldMap |
56 | { | 56 | { |
57 | public class WorldMapModule : IRegionModule | 57 | public class WorldMapModule : IRegionModule |
58 | { | 58 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 9165554..3ba8a97 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -33,7 +33,7 @@ using OpenMetaverse.Packets; | |||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | 35 | ||
36 | namespace OpenSim.Region.Environment.Modules.World.NPC | 36 | namespace OpenSim.Region.OptionalModules.World.NPC |
37 | { | 37 | { |
38 | public class NPCAvatar : IClientAPI | 38 | public class NPCAvatar : IClientAPI |
39 | { | 39 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index 2e7b16c..9dace33 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -30,7 +30,7 @@ using Nini.Config; | |||
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.NPC | 33 | namespace OpenSim.Region.OptionalModules.World.NPC |
34 | { | 34 | { |
35 | public class NPCModule : IRegionModule | 35 | public class NPCModule : IRegionModule |
36 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs index 8a49540..94ebcac 100644 --- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs | |||
@@ -36,7 +36,7 @@ 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 | 38 | ||
39 | namespace OpenSim.Region.Environment.Modules.World.TreePopulator | 39 | namespace OpenSim.Region.OptionalModules.World.TreePopulator |
40 | { | 40 | { |
41 | /// <summary> | 41 | /// <summary> |
42 | /// Version 2.0 - Very hacky compared to the original. Will fix original and release as 0.3 later. | 42 | /// Version 2.0 - Very hacky compared to the original. Will fix original and release as 0.3 later. |