aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs2
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientStackManager.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs)6
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs)4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs (renamed from OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs (renamed from OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs)4
-rw-r--r--OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs (renamed from OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs)4
-rw-r--r--OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs (renamed from OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs (renamed from OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs (renamed from OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs (renamed from OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs (renamed from OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs (renamed from OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs)4
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs (renamed from OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs (renamed from OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs (renamed from OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs (renamed from OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs (renamed from OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs (renamed from OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs (renamed from OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs (renamed from OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs)2
-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/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
-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/DataSnapshot/LandSnapshot.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IWorldComm.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/IXMLRPC.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs2
-rw-r--r--OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs63
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs)4
-rwxr-xr-xOpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeServer.py (renamed from OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py)0
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/AuraMetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/BeamMetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementModule.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs)6
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/GitDatabase.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs)6
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/IContentDatabase.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/README (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/README)0
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/Grid/Interregion/IInterregionModule.cs (renamed from OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/Grid/Interregion/InterregionModule.cs (renamed from OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/Grid/Interregion/RemotingObject.cs (renamed from OpenSim/Region/Environment/Modules/Grid/Interregion/RemotingObject.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/Python/PythonAPI/Console.cs (renamed from OpenSim/Region/Modules/Python/PythonAPI/Console.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/Python/PythonModule.cs (renamed from OpenSim/Region/Modules/Python/PythonModule.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/README9
-rw-r--r--OpenSim/Region/OptionalModules/SvnSerialiser/Properties/AssemblyInfo.cs (renamed from OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs (renamed from OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs)6
-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
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Helpers.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/EventManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
166 files changed, 205 insertions, 266 deletions
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index c0f57f1..458c6af 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -43,7 +43,7 @@ using OpenSim.Framework.Communications;
43using OpenSim.Framework.Communications.Cache; 43using OpenSim.Framework.Communications.Cache;
44using OpenSim.Region.Communications.Local; 44using OpenSim.Region.Communications.Local;
45using OpenSim.Region.Communications.Hypergrid; 45using OpenSim.Region.Communications.Hypergrid;
46using OpenSim.Region.Environment; 46using OpenSim.Region.CoreModules;
47using OpenSim.Region.Framework; 47using OpenSim.Region.Framework;
48using OpenSim.Region.Framework.Interfaces; 48using OpenSim.Region.Framework.Interfaces;
49using OpenSim.Region.Framework.Scenes; 49using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1c7751d..db6c0f1 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -41,8 +41,8 @@ using OpenSim.Framework.Console;
41using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
42using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes; 43using OpenSim.Region.Framework.Scenes;
44using OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver; 44using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
45using Timer=System.Timers.Timer; 45using Timer = System.Timers.Timer;
46 46
47namespace OpenSim 47namespace OpenSim
48{ 48{
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f2ea81d..aab80d9 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -44,7 +44,7 @@ using OpenSim.Framework.Statistics;
44using OpenSim.Region.ClientStack; 44using OpenSim.Region.ClientStack;
45using OpenSim.Region.Communications.Local; 45using OpenSim.Region.Communications.Local;
46using OpenSim.Region.Communications.OGS1; 46using OpenSim.Region.Communications.OGS1;
47using OpenSim.Region.Environment; 47using OpenSim.Region.CoreModules;
48using OpenSim.Region.Framework; 48using OpenSim.Region.Framework;
49using OpenSim.Region.Framework.Interfaces; 49using OpenSim.Region.Framework.Interfaces;
50using OpenSim.Region.Framework.Scenes; 50using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index 6cad7c9..f947d06 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -35,7 +35,7 @@ using OpenSim.Region.ClientStack;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37 37
38namespace OpenSim.Region.Environment 38namespace OpenSim.Region.ClientStack
39{ 39{
40 public class ClientStackManager 40 public class ClientStackManager
41 { 41 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f53174a..a1263a1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -798,7 +798,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
798 798
799 /// <summary> 799 /// <summary>
800 /// Starts up the timers to check the client and resend unacked packets 800 /// Starts up the timers to check the client and resend unacked packets
801 /// Adds the client to the OpenSim.Region.Environment.Scenes.Scene 801 /// Adds the client to the OpenSim.Region.Framework.Scenes.Scene
802 /// </summary> 802 /// </summary>
803 protected virtual void InitNewClient() 803 protected virtual void InitNewClient()
804 { 804 {
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 18d8c5c..24ebd7e 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -38,7 +38,7 @@ using OpenSim.Framework.Communications.Cache;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Region.Framework; 39using OpenSim.Region.Framework;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Environment; 41using OpenSim.Region.CoreModules;
42using OpenSim.Region.Physics.Manager; 42using OpenSim.Region.Physics.Manager;
43 43
44namespace OpenSim.Region.ClientStack 44namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 1ac0807..d084dbd 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -38,7 +38,7 @@ using OpenSim.Framework.Communications.Cache;
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory 41namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
42{ 42{
43 public class AvatarFactoryModule : IAvatarFactory, IRegionModule 43 public class AvatarFactoryModule : IAvatarFactory, IRegionModule
44 { 44 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index f234b75..f036faf 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.Environment.Modules.Avatar.Chat 42namespace OpenSim.Region.CoreModules.Avatar.Chat
43{ 43{
44 public class ChatModule : IRegionModule 44 public class ChatModule : IRegionModule
45 { 45 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index f032319..1ed608a 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -41,7 +41,7 @@ using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Framework.Communications.Cache; 42using OpenSim.Framework.Communications.Cache;
43 43
44namespace OpenSim.Region.Environment.Modules.Avatar.Combat.CombatModule 44namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
45{ 45{
46 public class CombatModule : IRegionModule 46 public class CombatModule : IRegionModule
47 { 47 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 1ec5e9b..0a1de44 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Servers;
42using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes; 43using OpenSim.Region.Framework.Scenes;
44 44
45namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney 45namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney
46{ 46{
47 /// <summary> 47 /// <summary>
48 /// Demo Economy/Money Module. This is not a production quality money/economy module! 48 /// Demo Economy/Money Module. This is not a production quality money/economy module!
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index d3ac2c0..7326373 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -34,7 +34,7 @@ using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37namespace OpenSim.Region.Environment.Modules.Avatar.Dialog 37namespace OpenSim.Region.CoreModules.Avatar.Dialog
38{ 38{
39 public class DialogModule : IRegionModule, IDialogModule 39 public class DialogModule : IRegionModule, IDialogModule
40 { 40 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 0ed962e..fb4d08a 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Servers;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.Environment.Modules.Avatar.Friends 42namespace OpenSim.Region.CoreModules.Avatar.Friends
43{ 43{
44 /* 44 /*
45 This module handles adding/removing friends, and the the presence 45 This module handles adding/removing friends, and the the presence
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 969c1d8..a3a642f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -35,7 +35,7 @@ using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using System.Reflection; 36using System.Reflection;
37 37
38namespace OpenSim.Region.Environment.Modules.Avatar.Gestures 38namespace OpenSim.Region.CoreModules.Avatar.Gestures
39{ 39{
40 public class GesturesModule : IRegionModule 40 public class GesturesModule : IRegionModule
41 { 41 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index e654912..92d0fdd 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Avatar.Groups 38namespace OpenSim.Region.CoreModules.Avatar.Groups
39{ 39{
40 public class GroupsModule : IRegionModule 40 public class GroupsModule : IRegionModule
41 { 41 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 3a1b282..3ad2c91 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Client;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage 42namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
43{ 43{
44 public class InstantMessageModule : IRegionModule 44 public class InstantMessageModule : IRegionModule
45 { 45 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 347c305..91c22eb 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Client;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage 42namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
43{ 43{
44 public class MessageTransferModule : IRegionModule, IMessageTransferModule 44 public class MessageTransferModule : IRegionModule, IMessageTransferModule
45 { 45 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index c84d3d5..49fd70a 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Client;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage 42namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
43{ 43{
44 public class PresenceModule : IRegionModule, IPresenceModule 44 public class PresenceModule : IRegionModule, IPresenceModule
45 { 45 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 3a58202..49006a2 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -33,15 +33,15 @@ using System.Reflection;
33using System.Xml; 33using System.Xml;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Environment.Modules.World.Archiver; 36using OpenSim.Region.CoreModules.World.Archiver;
37using OpenSim.Region.CoreModules.World.Serialiser;
37using OpenSim.Framework; 38using OpenSim.Framework;
38using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
40using log4net; 41using log4net;
41using OpenSim.Region.Environment.Modules.World.Serialiser;
42 42
43 43
44namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver 44namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
45{ 45{
46 public class InventoryArchiveReadRequest 46 public class InventoryArchiveReadRequest
47 { 47 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index e23f2a8..f548296 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -33,14 +33,14 @@ using System.Reflection;
33using System.Xml; 33using System.Xml;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Environment.Modules.World.Archiver; 36using OpenSim.Region.CoreModules.World.Archiver;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
40using log4net; 40using log4net;
41 41
42 42
43namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver 43namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
44{ 44{
45 public class InventoryArchiveWriteRequest 45 public class InventoryArchiveWriteRequest
46 { 46 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 62fb3a2..d2cf6c9 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
39 39
40namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer 40namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
41{ 41{
42 public class InventoryTransferModule : IInventoryTransferModule, IRegionModule 42 public class InventoryTransferModule : IInventoryTransferModule, IRegionModule
43 { 43 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index 79d5409..ebf4f0a 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework.Client;
40using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42 42
43namespace OpenSim.Region.Environment.Modules.Avatar.Lure 43namespace OpenSim.Region.CoreModules.Avatar.Lure
44{ 44{
45 public class LureModule : IRegionModule 45 public class LureModule : IRegionModule
46 { 46 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
index c853582..193307d 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
@@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 39using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
40 40
41namespace OpenSim.Region.Environment.Modules.Avatar.ObjectCaps 41namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
42{ 42{
43 public class ObjectAdd : IRegionModule 43 public class ObjectAdd : IRegionModule
44 { 44 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
index a7e9849..6ea5b56 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Avatar.Profiles 38namespace OpenSim.Region.CoreModules.Avatar.Profiles
39{ 39{
40 public class AvatarProfilesModule : IRegionModule 40 public class AvatarProfilesModule : IRegionModule
41 { 41 {
diff --git a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index 33ccbf4..3a9df4a 100644
--- a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -41,7 +41,7 @@ using OpenSim.Framework.Communications.Cache;
41using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.Framework.Scenes; 42using OpenSim.Region.Framework.Scenes;
43 43
44namespace OpenSim.Region.Environment.Modules.Communications.Local 44namespace OpenSim.Region.CoreModules.Communications.Local
45{ 45{
46 public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn 46 public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn
47 { 47 {
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
index 95b95ee..b4f4814 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
@@ -45,9 +45,9 @@ using OpenSim.Framework.Servers;
45using OpenSim.Region.Framework.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Framework.Scenes; 46using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Framework.Scenes.Hypergrid; 47using OpenSim.Region.Framework.Scenes.Hypergrid;
48using OpenSim.Region.Environment.Modules.Communications.Local; 48using OpenSim.Region.CoreModules.Communications.Local;
49 49
50namespace OpenSim.Region.Environment.Modules.Communications.REST 50namespace OpenSim.Region.CoreModules.Communications.REST
51{ 51{
52 public class RESTInterregionComms : IRegionModule, IInterregionCommsOut 52 public class RESTInterregionComms : IRegionModule, IInterregionCommsOut
53 { 53 {
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index fb30321..e81466a 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -52,7 +52,7 @@ using OSDArray = OpenMetaverse.StructuredData.OSDArray;
52using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 52using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
53using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>; 53using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
54 54
55namespace OpenSim.Region.Environment.Modules.Framework.EventQueue 55namespace OpenSim.Region.CoreModules.Framework.EventQueue
56{ 56{
57 public struct QueueItem 57 public struct QueueItem
58 { 58 {
@@ -617,7 +617,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
617 617
618 public void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID) 618 public void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID)
619 { 619 {
620 OSD item = Environment.EventQueueHelper.ParcelProperties(parcelPropertiesPacket); 620 OSD item = EventQueueHelper.ParcelProperties(parcelPropertiesPacket);
621 Enqueue(item, avatarID); 621 Enqueue(item, avatarID);
622 } 622 }
623 623
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
index b38ddba..80f6fce 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
@@ -31,7 +31,7 @@ using OpenMetaverse;
31using OpenMetaverse.Packets; 31using OpenMetaverse.Packets;
32using OpenMetaverse.StructuredData; 32using OpenMetaverse.StructuredData;
33 33
34namespace OpenSim.Region.Environment 34namespace OpenSim.Region.CoreModules.Framework.EventQueue
35{ 35{
36 public class EventQueueHelper 36 public class EventQueueHelper
37 { 37 {
diff --git a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
index b6114e8..fe29e0c 100644
--- a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Region.Framework.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31 31
32namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander 32namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
33{ 33{
34 /// <summary> 34 /// <summary>
35 /// A single function call encapsulated in a class which enforces arguments when passing around as Object[]'s. 35 /// A single function call encapsulated in a class which enforces arguments when passing around as Object[]'s.
diff --git a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
index cd66295..cd905ab 100644
--- a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
@@ -33,7 +33,7 @@ using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35 35
36namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander 36namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
37{ 37{
38 /// <summary> 38 /// <summary>
39 /// A class to enable modules to register console and script commands, which enforces typing and valid input. 39 /// A class to enable modules to register console and script commands, which enforces typing and valid input.
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index 4cb1c20..13efe6b 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -45,7 +45,7 @@ using OpenSim.Region.Framework.Scenes;
45using OpenSim.Grid.AssetServer; 45using OpenSim.Grid.AssetServer;
46using OpenSim.Data; 46using OpenSim.Data;
47 47
48namespace OpenSim.Region.Environment.Modules.Hypergrid 48namespace OpenSim.Region.CoreModules.Hypergrid
49{ 49{
50 public class HGStandaloneAssetService : IRegionModule 50 public class HGStandaloneAssetService : IRegionModule
51 { 51 {
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
index 54ba761..dfc859e 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework.Servers;
40using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42 42
43namespace OpenSim.Region.Environment.Modules.Hypergrid 43namespace OpenSim.Region.CoreModules.Hypergrid
44{ 44{
45 public class HGStandaloneInventoryService : IRegionModule 45 public class HGStandaloneInventoryService : IRegionModule
46 { 46 {
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 1d9182e..5540cc3 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -50,14 +50,14 @@ using OpenSim.Framework.Servers;
50using OpenSim.Region.Framework.Interfaces; 50using OpenSim.Region.Framework.Interfaces;
51using OpenSim.Region.Framework.Scenes; 51using OpenSim.Region.Framework.Scenes;
52using OpenSim.Region.Framework.Scenes.Types; 52using OpenSim.Region.Framework.Scenes.Types;
53using OpenSim.Region.Environment.Modules.World.WorldMap; 53using OpenSim.Region.CoreModules.World.WorldMap;
54using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 54using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
55 55
56using OSD = OpenMetaverse.StructuredData.OSD; 56using OSD = OpenMetaverse.StructuredData.OSD;
57using OSDMap = OpenMetaverse.StructuredData.OSDMap; 57using OSDMap = OpenMetaverse.StructuredData.OSDMap;
58using OSDArray = OpenMetaverse.StructuredData.OSDArray; 58using OSDArray = OpenMetaverse.StructuredData.OSDArray;
59 59
60namespace OpenSim.Region.Environment.Modules.Hypergrid 60namespace OpenSim.Region.CoreModules.Hypergrid
61{ 61{
62 public class HGWorldMapModule : WorldMapModule, IRegionModule 62 public class HGWorldMapModule : WorldMapModule, IRegionModule
63 { 63 {
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index 12a76de8..2e1675b 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -51,7 +51,7 @@ using OSD = OpenMetaverse.StructuredData.OSD;
51using OSDMap = OpenMetaverse.StructuredData.OSDMap; 51using OSDMap = OpenMetaverse.StructuredData.OSDMap;
52using OSDArray = OpenMetaverse.StructuredData.OSDArray; 52using OSDArray = OpenMetaverse.StructuredData.OSDArray;
53 53
54namespace OpenSim.Region.Environment.Modules.InterGrid 54namespace OpenSim.Region.CoreModules.InterGrid
55{ 55{
56 public struct OGPState 56 public struct OGPState
57 { 57 {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index f498f9a..e6a12a4 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture 39namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
40{ 40{
41 public class DynamicTextureModule : IRegionModule, IDynamicTextureManager 41 public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
42 { 42 {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index 81ce761..c23ff1e 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -38,7 +38,7 @@ using Nini.Config;
38using DotNetOpenMail; 38using DotNetOpenMail;
39using DotNetOpenMail.SmtpAuth; 39using DotNetOpenMail.SmtpAuth;
40 40
41namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules 41namespace OpenSim.Region.CoreModules.Scripting.EmailModules
42{ 42{
43 public class EmailModule : IEmailModule 43 public class EmailModule : IEmailModule
44 { 44 {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index faa6f3c..9f3bd09 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -82,7 +82,7 @@ using System.Collections;
82 * 82 *
83 * **************************************************/ 83 * **************************************************/
84 84
85namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest 85namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
86{ 86{
87 public class HttpRequestModule : IRegionModule, IHttpRequestModule 87 public class HttpRequestModule : IRegionModule, IHttpRequestModule
88 { 88 {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 0112ee6..afcaff1 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -35,7 +35,7 @@ using Nini.Config;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL 38namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
39{ 39{
40 public class LoadImageURLModule : IRegionModule, IDynamicTextureRender 40 public class LoadImageURLModule : IRegionModule, IDynamicTextureRender
41 { 41 {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 60806a7..0c709b5 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework.Scenes;
39 39
40//using Cairo; 40//using Cairo;
41 41
42namespace OpenSim.Region.Environment.Modules.Scripting.VectorRender 42namespace OpenSim.Region.CoreModules.Scripting.VectorRender
43{ 43{
44 public class VectorRenderModule : IRegionModule, IDynamicTextureRender 44 public class VectorRenderModule : IRegionModule, IDynamicTextureRender
45 { 45 {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 258734d..c363940 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -83,7 +83,7 @@ using OpenSim.Region.Framework.Scenes;
83 * 83 *
84 * **************************************************/ 84 * **************************************************/
85 85
86namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm 86namespace OpenSim.Region.CoreModules.Scripting.WorldComm
87{ 87{
88 public class WorldCommModule : IRegionModule, IWorldComm 88 public class WorldCommModule : IRegionModule, IWorldComm
89 { 89 {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index fb86731..942c130 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -73,7 +73,7 @@ using OpenSim.Region.Framework.Scenes;
73 * 73 *
74 * **************************************************/ 74 * **************************************************/
75 75
76namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC 76namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
77{ 77{
78 public class XMLRPCModule : IRegionModule, IXMLRPC 78 public class XMLRPCModule : IRegionModule, IXMLRPC
79 { 79 {
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 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Archiver 31namespace 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;
38using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Environment.Modules.World.Terrain; 41using OpenSim.Region.CoreModules.World.Terrain;
42 42
43namespace OpenSim.Region.Environment.Modules.World.Archiver 43namespace 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;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Environment.Modules.World.Serialiser; 38using OpenSim.Region.CoreModules.World.Serialiser;
39using OpenSim.Region.Environment.Modules.World.Terrain; 39using OpenSim.Region.CoreModules.World.Terrain;
40 40
41namespace OpenSim.Region.Environment.Modules.World.Archiver 41namespace 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;
29using OpenSim.Framework.Communications.Cache; 29using OpenSim.Framework.Communications.Cache;
30using OpenSim.Region.Framework.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Framework.Scenes; 31using OpenSim.Region.Framework.Scenes;
32using OpenSim.Region.Environment.Modules.World.Serialiser; 32using OpenSim.Region.CoreModules.World.Serialiser;
33using OpenSim.Region.Environment.Modules.World.Terrain; 33using OpenSim.Region.CoreModules.World.Terrain;
34using System; 34using System;
35using System.Collections.Generic; 35using System.Collections.Generic;
36using System.IO; 36using System.IO;
@@ -42,7 +42,7 @@ using OpenMetaverse;
42using log4net; 42using log4net;
43using Nini.Config; 43using Nini.Config;
44 44
45namespace OpenSim.Region.Environment.Modules.World.Archiver 45namespace 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;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Environment.Modules.World.Serialiser; 38using OpenSim.Region.CoreModules.World.Serialiser;
39 39
40namespace OpenSim.Region.Environment.Modules.World.Archiver 40namespace 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;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35 35
36namespace OpenSim.Region.Environment.Modules.World.Archiver 36namespace 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;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37 37
38namespace OpenSim.Region.Environment.Modules.World.Archiver 38namespace 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;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Environment.Modules.World.Archiver 39namespace 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;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34 34
35namespace OpenSim.Region.Environment.Modules.World.Archiver 35namespace 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;
31using System.Text; 31using System.Text;
32using log4net; 32using log4net;
33 33
34namespace OpenSim.Region.Environment.Modules.World.Archiver 34namespace 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;
32using System.Reflection; 32using System.Reflection;
33using log4net; 33using log4net;
34 34
35namespace OpenSim.Region.Environment.Modules.World.Archiver 35namespace 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;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Modules.World.Archiver; 36using OpenSim.Region.CoreModules.World.Archiver;
37using OpenSim.Region.Environment.Modules.World.Serialiser; 37using OpenSim.Region.CoreModules.World.Serialiser;
38using OpenSim.Region.Environment.Modules.World.Terrain; 38using OpenSim.Region.CoreModules.World.Terrain;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Tests.Common.Setup; 40using OpenSim.Tests.Common.Setup;
41 41
42namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests 42namespace 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;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.World.Estate 38namespace 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;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37 37
38namespace OpenSim.Region.Environment.Modules.World.Estate 38namespace 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;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
34 34
35namespace OpenSim.Region.Environment.Modules.World.Land 35namespace 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;
40using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.Physics.Manager;
41using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 41using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
42 42
43namespace OpenSim.Region.Environment.Modules.World.Land 43namespace 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;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37namespace OpenSim.Region.Environment.Modules.World.Land 37namespace 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;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Environment.Modules.Framework; 39using OpenSim.Region.CoreModules.Framework;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41 41
42namespace OpenSim.Region.Environment.Modules.World.Permissions 42namespace 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
28using OpenSim.Region.Framework.Scenes; 28using OpenSim.Region.Framework.Scenes;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Serialiser 30namespace 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;
32using System.Xml; 32using System.Xml;
33using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
34 34
35namespace OpenSim.Region.Environment.Modules.World.Serialiser 35namespace 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
28using OpenSim.Region.Environment.Modules.World.Terrain; 28using OpenSim.Region.CoreModules.World.Terrain;
29using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders; 29using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Modules.World.Serialiser 32namespace 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;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander; 35using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
36 36
37namespace OpenSim.Region.Environment.Modules.World.Serialiser 37namespace 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;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37namespace OpenSim.Region.Environment.World.Sound 37namespace 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;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Environment.Modules 36namespace OpenSim.Region.CoreModules
37{ 37{
38 public class SunModule : IRegionModule 38 public class SunModule : IRegionModule
39 { 39 {
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
28using System; 28using System;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Environment.Modules.World.Terrain; 30using OpenSim.Region.CoreModules.World.Terrain;
31using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes; 31using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
32 32
33namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects 33namespace 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 @@
27using System; 27using System;
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Scenes; 29using OpenSim.Region.Framework.Scenes;
30using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; 30using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
31 31
32namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects 32namespace 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;
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Scenes; 29using OpenSim.Region.Framework.Scenes;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects 31namespace 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;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 33namespace 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;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 33namespace 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;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
34 34
35namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 35namespace 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;
31using System.IO; 31using System.IO;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33 33
34namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 34namespace 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;
30using OpenSim.Region.Framework.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Framework.Scenes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 33namespace 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;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 33namespace 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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 32namespace 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;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 33namespace 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;
31using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32using OpenSim.Region.Framework.Scenes; 32using OpenSim.Region.Framework.Scenes;
33 33
34namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 34namespace 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
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 30namespace 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
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 30namespace 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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 32namespace 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
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 30namespace 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
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 30namespace 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
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 30namespace 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
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain 30namespace 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 @@
28using System; 28using System;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Terrain 31namespace 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 @@
28using System.IO; 28using System.IO;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Terrain 31namespace 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;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain 33namespace 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
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain 30namespace 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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 32namespace 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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 32namespace 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 @@
28using System; 28using System;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 31namespace 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;
30using OpenSim.Region.Framework.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Framework.Scenes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 33namespace 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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 32namespace 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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 32namespace 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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 32namespace 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 @@
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Scenes; 29using OpenSim.Region.Framework.Scenes;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 31namespace 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 @@
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Scenes; 29using OpenSim.Region.Framework.Scenes;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 31namespace 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
28using System; 28using System;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain 30namespace 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;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander; 38using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
39using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders; 39using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
40using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes; 40using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
41using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; 41using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
42 42
43namespace OpenSim.Region.Environment.Modules.World.Terrain 43namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; 31using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain.Tests 33namespace 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;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Environment.Modules.Avatar.Vegetation 39namespace 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;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Environment.Modules 36namespace 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;
29using OpenSim.Region.Framework.Scenes; 29using OpenSim.Region.Framework.Scenes;
30using Nini.Config; 30using Nini.Config;
31 31
32namespace OpenSim.Region.Environment 32namespace 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;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using OpenMetaverse; 40using OpenMetaverse;
41 41
42namespace OpenSim.Region.Environment.Modules.World.WorldMap 42namespace 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;
36using log4net; 36using log4net;
37using Nini.Config; 37using Nini.Config;
38 38
39namespace OpenSim.Region.Environment.Modules.World.WorldMap 39namespace 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;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.Environment.Modules.World.WorldMap 42namespace 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;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Environment.Modules.World.Terrain; 42using OpenSim.Region.CoreModules.World.Terrain;
43 43
44namespace OpenSim.Region.Environment.Modules.World.WorldMap 44namespace 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;
52using OSDMap = OpenMetaverse.StructuredData.OSDMap; 52using OSDMap = OpenMetaverse.StructuredData.OSDMap;
53using OSDArray = OpenMetaverse.StructuredData.OSDArray; 53using OSDArray = OpenMetaverse.StructuredData.OSDArray;
54 54
55namespace OpenSim.Region.Environment.Modules.World.WorldMap 55namespace OpenSim.Region.CoreModules.World.WorldMap
56{ 56{
57 public class WorldMapModule : IRegionModule 57 public class WorldMapModule : IRegionModule
58 { 58 {
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index bfc45fc..52659e4 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -34,7 +34,7 @@ using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.DataSnapshot.Interfaces; 35using OpenSim.Region.DataSnapshot.Interfaces;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Modules.World.Land; 37using OpenSim.Region.CoreModules.World.Land;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenMetaverse.Packets; 39using OpenMetaverse.Packets;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 6f7ff6b..949cc38 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -33,7 +33,7 @@ using log4net;
33using OpenSim.Region.DataSnapshot.Interfaces; 33using OpenSim.Region.DataSnapshot.Interfaces;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Environment.Modules.World.Land; 36using OpenSim.Region.CoreModules.World.Land;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenMetaverse; 38using OpenMetaverse;
39 39
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index 24865db..73bbb4c 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31// using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
32 31
33namespace OpenSim.Region.Framework.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
34{ 33{
diff --git a/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
index 6570b0a..cdd2b7c 100644
--- a/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
@@ -28,8 +28,6 @@
28using OpenMetaverse; 28using OpenMetaverse;
29using Nwc.XmlRpc; 29using Nwc.XmlRpc;
30 30
31// using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
32
33namespace OpenSim.Region.Framework.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
34{ 32{
35 public interface IXmlRpcRequestInfo 33 public interface IXmlRpcRequestInfo
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index bd9c260..cc82a48 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -40,7 +40,6 @@ using OpenSim.Framework;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43// using OpenSim.Region.Environment;
44using OpenSim.Region.Framework.Scenes; 43using OpenSim.Region.Framework.Scenes;
45 44
46//using HyperGrid.Framework; 45//using HyperGrid.Framework;
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index ba81270..c6d2bfc 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -40,7 +40,6 @@ using OpenSim.Framework;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43// using OpenSim.Region.Environment;
44using OpenSim.Region.Framework.Scenes; 43using OpenSim.Region.Framework.Scenes;
45 44
46namespace OpenSim.Region.Framework.Scenes.Hypergrid 45namespace OpenSim.Region.Framework.Scenes.Hypergrid
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
index a52fdc6..1cb98db 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
@@ -34,7 +34,6 @@ using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35 35
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37// using OpenSim.Region.Environment;
38using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
39using TPFlags = OpenSim.Framework.Constants.TeleportFlags; 38using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
40 39
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index d0dc4f7..a17df71 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -39,7 +39,6 @@ using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Communications.Capabilities; 40using OpenSim.Framework.Communications.Capabilities;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42// using OpenSim.Region.Environment;
43using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
44 43
45namespace OpenSim.Region.Framework.Scenes.Hypergrid 44namespace OpenSim.Region.Framework.Scenes.Hypergrid
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index dc27a55..096b2cb 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Scenes;
37using OpenSim.Tests.Common.Mock; 37using OpenSim.Tests.Common.Mock;
38using OpenSim.Tests.Common.Setup; 38using OpenSim.Tests.Common.Setup;
39 39
40namespace OpenSim.Region.Environment.Scenes.Tests 40namespace OpenSim.Region.CoreModules.Scenes.Tests
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// Basic scene object tests (create, read and delete but not update). 43 /// Basic scene object tests (create, read and delete but not update).
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 3efb886..3e0f48f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Scenes;
37using OpenSim.Tests.Common.Mock; 37using OpenSim.Tests.Common.Mock;
38using OpenSim.Tests.Common.Setup; 38using OpenSim.Tests.Common.Setup;
39 39
40namespace OpenSim.Region.Environment.Scenes.Tests 40namespace OpenSim.Region.CoreModules.Scenes.Tests
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// Linking tests 43 /// Linking tests
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index ec36be9..2053c8f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -36,8 +36,8 @@ using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Modules.Communications.Local; 39using OpenSim.Region.CoreModules.Communications.Local;
40using OpenSim.Region.Environment.Modules.World.Serialiser; 40using OpenSim.Region.CoreModules.World.Serialiser;
41using OpenSim.Tests.Common.Mock; 41using OpenSim.Tests.Common.Mock;
42using OpenSim.Tests.Common.Setup; 42using OpenSim.Tests.Common.Setup;
43 43
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 0b9937a..5d2839c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -32,7 +32,7 @@ using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Environment.Modules.Communications.REST; 35using OpenSim.Region.CoreModules.Communications.REST;
36using OpenSim.Tests.Common.Mock; 36using OpenSim.Tests.Common.Mock;
37using OpenSim.Tests.Common.Setup; 37using OpenSim.Tests.Common.Setup;
38 38
diff --git a/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs
deleted file mode 100644
index 63e574a..0000000
--- a/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,63 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices;
31
32// General information about an assembly is controlled through the following
33// set of attributes. Change these attribute values to modify the information
34// associated with an assembly.
35[assembly: AssemblyTitle("Python")]
36[assembly: AssemblyDescription("")]
37[assembly: AssemblyConfiguration("")]
38[assembly: AssemblyCompany("")]
39[assembly: AssemblyProduct("Python")]
40[assembly: AssemblyCopyright("Copyright (c) 2008")]
41[assembly: AssemblyTrademark("")]
42[assembly: AssemblyCulture("")]
43
44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type.
47[assembly: ComVisible(false)]
48
49// The following GUID is for the ID of the typelib if this project is exposed to COM
50[assembly: Guid("5bd55f67-385d-4a43-893a-b5d2ea43f07d")]
51
52// Version information for an assembly consists of the following four values:
53//
54// Major Version
55// Minor Version
56// Build Number
57// Revision
58//
59// You can specify all the values or you can default the Build and Revision Numbers
60// by using the '*' as shown below:
61// [assembly: AssemblyVersion("1.0.*")]
62[assembly: AssemblyVersion("1.0.0.0")]
63[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
index dfa1caa..167f0cc 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Avatar.Chat 38namespace OpenSim.Region.OptionalModules.Avatar.Chat
39{ 39{
40 40
41 // An instance of this class exists for each unique combination of 41 // An instance of this class exists for each unique combination of
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
index ccd81c7..0facc14 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Environment.Modules.Avatar.Chat 39namespace OpenSim.Region.OptionalModules.Avatar.Chat
40{ 40{
41 public class IRCBridgeModule : IRegionModule 41 public class IRCBridgeModule : IRegionModule
42 { 42 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index c3cafb0..f5c324d 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework;
40using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42 42
43namespace OpenSim.Region.Environment.Modules.Avatar.Chat 43namespace OpenSim.Region.OptionalModules.Avatar.Chat
44{ 44{
45 public class IRCConnector 45 public class IRCConnector
46 { 46 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
index 78f4265..6733120 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Avatar.Chat 38namespace OpenSim.Region.OptionalModules.Avatar.Chat
39{ 39{
40 // An instance of this class exists for every active region 40 // An instance of this class exists for every active region
41 41
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index 5ac5dbe..bb46b11 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -43,9 +43,9 @@ using OpenSim.Framework;
43using OpenSim.Framework.Servers; 43using OpenSim.Framework.Servers;
44using OpenSim.Region.Framework.Interfaces; 44using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.Framework.Scenes; 45using OpenSim.Region.Framework.Scenes;
46using OpenSim.Region.Environment.Modules.Avatar.Chat; 46using OpenSim.Region.CoreModules.Avatar.Chat;
47 47
48namespace OpenSim.Region.Environment.Modules.Avatar.Concierge 48namespace OpenSim.Region.OptionalModules.Avatar.Concierge
49{ 49{
50 public class ConciergeModule : ChatModule, IRegionModule 50 public class ConciergeModule : ChatModule, IRegionModule
51 { 51 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeServer.py
index 1c088fb..1c088fb 100755
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeServer.py
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
index 33d7135..c827214 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
@@ -40,7 +40,7 @@ using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using Caps=OpenSim.Framework.Communications.Capabilities.Caps; 41using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
42 42
43namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice 43namespace OpenSim.Region.OptionalModules.Avatar.Voice.AsterixVoice
44{ 44{
45 public class AsteriskVoiceModule : IRegionModule 45 public class AsteriskVoiceModule : IRegionModule
46 { 46 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
index e4d9b7c..3e8a433 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using Caps=OpenSim.Framework.Communications.Capabilities.Caps; 40using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
41 41
42namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice 42namespace OpenSim.Region.OptionalModules.Avatar.Voice.SIPVoice
43{ 43{
44 public class SIPVoiceModule : IRegionModule 44 public class SIPVoiceModule : IRegionModule
45 { 45 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/AuraMetaEntity.cs
index 9695fb8..d4acc34 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/AuraMetaEntity.cs
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager;
50 50
51using log4net; 51using log4net;
52 52
53namespace OpenSim.Region.Environment.Modules.ContentManagement 53namespace OpenSim.Region.OptionalModules.ContentManagement
54{ 54{
55 public class AuraMetaEntity : PointMetaEntity 55 public class AuraMetaEntity : PointMetaEntity
56 { 56 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/BeamMetaEntity.cs
index 3b1a45e..c0a0603 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/BeamMetaEntity.cs
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager;
50 50
51using log4net; 51using log4net;
52 52
53namespace OpenSim.Region.Environment.Modules.ContentManagement 53namespace OpenSim.Region.OptionalModules.ContentManagement
54{ 54{
55 public class BeamMetaEntity : PointMetaEntity 55 public class BeamMetaEntity : PointMetaEntity
56 { 56 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs
index 5a86d48..80989a7 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager;
49 49
50using log4net; 50using log4net;
51 51
52namespace OpenSim.Region.Environment.Modules.ContentManagement 52namespace OpenSim.Region.OptionalModules.ContentManagement
53{ 53{
54 /// <summary> 54 /// <summary>
55 /// The controller in a Model-View-Controller framework. This controller catches actions by the avatars, creates work packets, loops through these work packets in a separate thread, 55 /// The controller in a Model-View-Controller framework. This controller catches actions by the avatars, creates work packets, loops through these work packets in a separate thread,
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs
index cfd5cde..d5cf596 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs
@@ -52,7 +52,7 @@ using OpenSim.Region.Physics.Manager;
52 52
53using log4net; 53using log4net;
54 54
55namespace OpenSim.Region.Environment.Modules.ContentManagement 55namespace OpenSim.Region.OptionalModules.ContentManagement
56{ 56{
57 public class CMEntityCollection 57 public class CMEntityCollection
58 { 58 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
index 6399608..761dca9 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager;
49 49
50using log4net; 50using log4net;
51 51
52namespace OpenSim.Region.Environment.Modules.ContentManagement 52namespace OpenSim.Region.OptionalModules.ContentManagement
53{ 53{
54 public class CMModel 54 public class CMModel
55 { 55 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
index e5c9bb3..a1a4d94 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager;
49 49
50using log4net; 50using log4net;
51 51
52namespace OpenSim.Region.Environment.Modules.ContentManagement 52namespace OpenSim.Region.OptionalModules.ContentManagement
53{ 53{
54 public class CMView 54 public class CMView
55 { 55 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
index 2ea5ebc..4d65038 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager;
49 49
50using log4net; 50using log4net;
51 51
52namespace OpenSim.Region.Environment.Modules.ContentManagement 52namespace OpenSim.Region.OptionalModules.ContentManagement
53{ 53{
54 public class ContentManagementEntity : MetaEntity 54 public class ContentManagementEntity : MetaEntity
55 { 55 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementModule.cs
index 417cbce..21bc8b2 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementModule.cs
@@ -48,7 +48,7 @@ using OpenSim.Region.Physics.Manager;
48 48
49using log4net; 49using log4net;
50 50
51namespace OpenSim.Region.Environment.Modules.ContentManagement 51namespace OpenSim.Region.OptionalModules.ContentManagement
52{ 52{
53 public class ContentManagementModule : IRegionModule 53 public class ContentManagementModule : IRegionModule
54 { 54 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs
index 65db153..6a50906 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs
@@ -47,13 +47,13 @@ using Nini.Config;
47using OpenSim.Framework; 47using OpenSim.Framework;
48using OpenSim.Region.Framework.Interfaces; 48using OpenSim.Region.Framework.Interfaces;
49using OpenSim.Region.Framework.Scenes; 49using OpenSim.Region.Framework.Scenes;
50using OpenSim.Region.Environment.Modules.World.Serialiser; 50using OpenSim.Region.CoreModules.World.Serialiser;
51using OpenSim.Region.Environment.Modules.World.Terrain; 51using OpenSim.Region.CoreModules.World.Terrain;
52using OpenSim.Region.Physics.Manager; 52using OpenSim.Region.Physics.Manager;
53 53
54using log4net; 54using log4net;
55 55
56namespace OpenSim.Region.Environment.Modules.ContentManagement 56namespace OpenSim.Region.OptionalModules.ContentManagement
57{ 57{
58 public class FileSystemDatabase : IContentDatabase 58 public class FileSystemDatabase : IContentDatabase
59 { 59 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/GitDatabase.cs
index 4209dab..d24747c 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/GitDatabase.cs
@@ -48,13 +48,13 @@ using Nini.Config;
48using OpenSim.Framework; 48using OpenSim.Framework;
49using OpenSim.Region.Framework.Interfaces; 49using OpenSim.Region.Framework.Interfaces;
50using OpenSim.Region.Framework.Scenes; 50using OpenSim.Region.Framework.Scenes;
51using OpenSim.Region.Environment.Modules.World.Serialiser; 51using OpenSim.Region.CoreModules.World.Serialiser;
52using OpenSim.Region.Environment.Modules.World.Terrain; 52using OpenSim.Region.CoreModules.World.Terrain;
53using OpenSim.Region.Physics.Manager; 53using OpenSim.Region.Physics.Manager;
54 54
55using log4net; 55using log4net;
56 56
57namespace OpenSim.Region.Environment.Modules.ContentManagement 57namespace OpenSim.Region.OptionalModules.ContentManagement
58{ 58{
59 /// <summary> 59 /// <summary>
60 /// Just a stub :-( 60 /// Just a stub :-(
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/IContentDatabase.cs
index 79dc86e..7a25fa5 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/IContentDatabase.cs
@@ -40,7 +40,7 @@ using OpenMetaverse;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using Nini.Config; 41using Nini.Config;
42 42
43namespace OpenSim.Region.Environment.Modules.ContentManagement 43namespace OpenSim.Region.OptionalModules.ContentManagement
44{ 44{
45 public interface IContentDatabase 45 public interface IContentDatabase
46 { 46 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
index c8f8c2f..63c74e1 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager;
50 50
51using log4net; 51using log4net;
52 52
53namespace OpenSim.Region.Environment.Modules.ContentManagement 53namespace OpenSim.Region.OptionalModules.ContentManagement
54{ 54{
55 public class MetaEntity 55 public class MetaEntity
56 { 56 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs
index d6ba92f..22f09fd 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager;
50 50
51using log4net; 51using log4net;
52 52
53namespace OpenSim.Region.Environment.Modules.ContentManagement 53namespace OpenSim.Region.OptionalModules.ContentManagement
54{ 54{
55 public class PointMetaEntity : MetaEntity 55 public class PointMetaEntity : MetaEntity
56 { 56 {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/README b/OpenSim/Region/OptionalModules/ContentManagementSystem/README
index 1a69fef..1a69fef 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/README
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/README
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs
index 225a682..8957e8f 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs
@@ -48,7 +48,7 @@ using OpenSim.Region.Physics.Manager;
48 48
49using log4net; 49using log4net;
50 50
51namespace OpenSim.Region.Environment.Modules.ContentManagement 51namespace OpenSim.Region.OptionalModules.ContentManagement
52{ 52{
53 #region Enumerations 53 #region Enumerations
54 54
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs b/OpenSim/Region/OptionalModules/Grid/Interregion/IInterregionModule.cs
index edf1231..a2c98a4 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
+++ b/OpenSim/Region/OptionalModules/Grid/Interregion/IInterregionModule.cs
@@ -28,7 +28,7 @@
28using OpenSim.Framework; 28using OpenSim.Framework;
29using OpenSim.Region.Framework.Scenes; 29using OpenSim.Region.Framework.Scenes;
30 30
31namespace OpenSim.Region.Environment.Modules.Grid.Interregion 31namespace OpenSim.Region.CoreModules.Grid.Interregion
32{ 32{
33 public interface IInterregionModule 33 public interface IInterregionModule
34 { 34 {
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs b/OpenSim/Region/OptionalModules/Grid/Interregion/InterregionModule.cs
index cb571e4..21df83c 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
+++ b/OpenSim/Region/OptionalModules/Grid/Interregion/InterregionModule.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Grid.Interregion 38namespace OpenSim.Region.CoreModules.Grid.Interregion
39{ 39{
40 public class InterregionModule : IInterregionModule, IRegionModule 40 public class InterregionModule : IInterregionModule, IRegionModule
41 { 41 {
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/RemotingObject.cs b/OpenSim/Region/OptionalModules/Grid/Interregion/RemotingObject.cs
index 47357d2..b09c848 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/RemotingObject.cs
+++ b/OpenSim/Region/OptionalModules/Grid/Interregion/RemotingObject.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Framework; 30using OpenSim.Framework;
31 31
32namespace OpenSim.Region.Environment.Modules.Grid.Interregion 32namespace OpenSim.Region.CoreModules.Grid.Interregion
33{ 33{
34 public class RemotingObject : MarshalByRefObject 34 public class RemotingObject : MarshalByRefObject
35 { 35 {
diff --git a/OpenSim/Region/Modules/Python/PythonAPI/Console.cs b/OpenSim/Region/OptionalModules/Python/PythonAPI/Console.cs
index 215a9ad..215a9ad 100644
--- a/OpenSim/Region/Modules/Python/PythonAPI/Console.cs
+++ b/OpenSim/Region/OptionalModules/Python/PythonAPI/Console.cs
diff --git a/OpenSim/Region/Modules/Python/PythonModule.cs b/OpenSim/Region/OptionalModules/Python/PythonModule.cs
index 5dedac2..5dedac2 100644
--- a/OpenSim/Region/Modules/Python/PythonModule.cs
+++ b/OpenSim/Region/OptionalModules/Python/PythonModule.cs
diff --git a/OpenSim/Region/OptionalModules/README b/OpenSim/Region/OptionalModules/README
new file mode 100644
index 0000000..0fe7b87
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/README
@@ -0,0 +1,9 @@
1= OpenSim.Region.OptionalModules =
2
3The modules in this part of the OpenSim source tree are candidates for forge. For the time being, until we have reached consensus on
4
5 (a) what should be core or optional
6 (b) that we have reached a stable API
7 (c) how to maintain optional modules
8
9we will keep these modules in-tree. \ No newline at end of file
diff --git a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/SvnSerialiser/Properties/AssemblyInfo.cs
index 165fcea..165fcea 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/OptionalModules/SvnSerialiser/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs
index 6e3b620..c4fc584 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs
@@ -33,12 +33,12 @@ using System.Timers;
33using log4net; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Modules.World.Serialiser; 36using OpenSim.Region.CoreModules.World.Serialiser;
37using OpenSim.Region.Environment.Modules.World.Terrain; 37using OpenSim.Region.CoreModules.World.Terrain;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using PumaCode.SvnDotNet.AprSharp; 39using PumaCode.SvnDotNet.AprSharp;
40using PumaCode.SvnDotNet.SubversionSharp; 40using PumaCode.SvnDotNet.SubversionSharp;
41using Slash=System.IO.Path; 41using Slash = System.IO.Path;
42 42
43namespace OpenSim.Region.Modules.SvnSerialiser 43namespace OpenSim.Region.Modules.SvnSerialiser
44{ 44{
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;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Environment.Modules.World.NPC 36namespace 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;
30using OpenSim.Region.Framework.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Framework.Scenes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.Environment.Modules.World.NPC 33namespace 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;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Environment.Modules.World.TreePopulator 39namespace 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.
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index 7eb00a7..cc78b51 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; 32using OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney;
33using OpenSim.Region.Environment; 33using OpenSim.Region.CoreModules;
34using OpenSim.Region; 34using OpenSim.Region;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index f1f5f4b..dc7716e 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -31,7 +31,7 @@ using System.Reflection;
31using log4net; 31using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment; 34using OpenSim.Region.CoreModules.Framework.EventQueue;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Region.ScriptEngine.Interfaces; 37using OpenSim.Region.ScriptEngine.Interfaces;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 2429e96..d1006e3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -37,11 +37,11 @@ using OpenMetaverse.Packets;
37using OpenSim; 37using OpenSim;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Region.Environment; 40using OpenSim.Region.CoreModules;
41using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; 42using OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney;
43using OpenSim.Region.Environment.Modules.World.Land; 43using OpenSim.Region.CoreModules.World.Land;
44using OpenSim.Region.Environment.Modules.World.Terrain; 44using OpenSim.Region.CoreModules.World.Terrain;
45using OpenSim.Region.Framework.Scenes; 45using OpenSim.Region.Framework.Scenes;
46using OpenSim.Region.Physics.Manager; 46using OpenSim.Region.Physics.Manager;
47using OpenSim.Region.ScriptEngine.Shared; 47using OpenSim.Region.ScriptEngine.Shared;
@@ -4168,7 +4168,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4168 LSL_Vector SunDoubleVector3; 4168 LSL_Vector SunDoubleVector3;
4169 Vector3 SunFloatVector3; 4169 Vector3 SunFloatVector3;
4170 4170
4171 // sunPosition estate setting is set in OpenSim.Region.Environment.Modules.SunModule 4171 // sunPosition estate setting is set in OpenSim.Region.CoreModules.SunModule
4172 // have to convert from Vector3 (float) to LSL_Vector (double) 4172 // have to convert from Vector3 (float) to LSL_Vector (double)
4173 SunFloatVector3 = World.RegionInfo.RegionSettings.SunVector; 4173 SunFloatVector3 = World.RegionInfo.RegionSettings.SunVector;
4174 SunDoubleVector3.x = (double)SunFloatVector3.X; 4174 SunDoubleVector3.x = (double)SunFloatVector3.X;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
index 4c7dc8d..0654c07 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Environment.Modules.Scripting.HttpRequest; 30using OpenSim.Region.CoreModules.Scripting.HttpRequest;
31using OpenSim.Region.ScriptEngine.Shared; 31using OpenSim.Region.ScriptEngine.Shared;
32using OpenSim.Region.ScriptEngine.Interfaces; 32using OpenSim.Region.ScriptEngine.Interfaces;
33using OpenSim.Region.ScriptEngine.Shared.Api; 33using OpenSim.Region.ScriptEngine.Shared.Api;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
index eba52bf..5c95c66 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Region.Framework.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Environment.Modules.Scripting.WorldComm; 31using OpenSim.Region.CoreModules.Scripting.WorldComm;
32using OpenSim.Region.ScriptEngine.Interfaces; 32using OpenSim.Region.ScriptEngine.Interfaces;
33using OpenSim.Region.ScriptEngine.Shared; 33using OpenSim.Region.ScriptEngine.Shared;
34using OpenSim.Region.ScriptEngine.Shared.Api; 34using OpenSim.Region.ScriptEngine.Shared.Api;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
index bf1a923..893977b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; 30using OpenSim.Region.CoreModules.Scripting.XMLRPC;
31using OpenSim.Region.ScriptEngine.Interfaces; 31using OpenSim.Region.ScriptEngine.Interfaces;
32using OpenSim.Region.ScriptEngine.Shared; 32using OpenSim.Region.ScriptEngine.Shared;
33using OpenSim.Region.ScriptEngine.Shared.Api; 33using OpenSim.Region.ScriptEngine.Shared.Api;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
index 3cd6b76..feff86a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
@@ -33,7 +33,7 @@
33 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework" /> 33 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework" />
34 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" /> 34 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" />
35 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Console" /> 35 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Console" />
36 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Environment" /> 36 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.CoreModules" />
37 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Framework" /> 37 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Framework" />
38 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.ScriptEngine.Shared" /> 38 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.ScriptEngine.Shared" />
39 <ProjectReference type="Assembly" refto="../../../../../../bin/RAIL.dll" localcopy="False" /> 39 <ProjectReference type="Assembly" refto="../../../../../../bin/RAIL.dll" localcopy="False" />
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 777cb12..4236c2b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -33,7 +33,7 @@ using System.Collections.Generic;
33using System.Runtime.Serialization; 33using System.Runtime.Serialization;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment; 36using OpenSim.Region.CoreModules;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.ScriptEngine.Shared 39namespace OpenSim.Region.ScriptEngine.Shared
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 6b04248..a9a2dbf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -41,7 +41,7 @@ using log4net;
41using Nini.Config; 41using Nini.Config;
42using Amib.Threading; 42using Amib.Threading;
43using OpenSim.Framework; 43using OpenSim.Framework;
44using OpenSim.Region.Environment; 44using OpenSim.Region.CoreModules;
45using OpenSim.Region.Framework.Scenes; 45using OpenSim.Region.Framework.Scenes;
46using OpenSim.Region.Framework.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.ScriptEngine.Shared; 47using OpenSim.Region.ScriptEngine.Shared;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
index 7e8d690..ef3ba9a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
@@ -39,7 +39,7 @@ using log4net;
39using Nini.Config; 39using Nini.Config;
40using Amib.Threading; 40using Amib.Threading;
41using OpenSim.Framework; 41using OpenSim.Framework;
42using OpenSim.Region.Environment; 42using OpenSim.Region.CoreModules;
43using OpenSim.Region.Framework.Scenes; 43using OpenSim.Region.Framework.Scenes;
44using OpenSim.Region.Framework.Interfaces; 44using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.ScriptEngine.Shared; 45using OpenSim.Region.ScriptEngine.Shared;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 09f751f..2632948 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -30,7 +30,7 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; 33using OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.ScriptEngine.Shared; 36using OpenSim.Region.ScriptEngine.Shared;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 2cb18ea..a5570b3 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -41,7 +41,7 @@ using log4net;
41using Nini.Config; 41using Nini.Config;
42using Amib.Threading; 42using Amib.Threading;
43using OpenSim.Framework; 43using OpenSim.Framework;
44using OpenSim.Region.Environment; 44using OpenSim.Region.CoreModules.Framework.EventQueue;
45using OpenSim.Region.Framework.Scenes; 45using OpenSim.Region.Framework.Scenes;
46using OpenSim.Region.Framework.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.ScriptEngine.Shared; 47using OpenSim.Region.ScriptEngine.Shared;