From 9b66108081a8c8cf79faaa6c541554091c40850e Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 6 Feb 2009 16:55:34 +0000 Subject: [PATCH] This changeset is the step 1 of 2 in refactoring OpenSim.Region.Environment into a "framework" part and a modules only part. This first changeset refactors OpenSim.Region.Environment.Scenes, OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region modules in OpenSim.Region.Environment. The next step will be to move region modules up from OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and then sort out which modules are really core modules and which should move out to forge. I've been very careful to NOT BREAK anything. i hope i've succeeded. as this is the work of a whole week i hope i managed to keep track with the applied patches of the last week --- could any of you that did check in stuff have a look at whether it survived? thx! --- .../LoadRegions/LoadRegionsPlugin.cs | 13 +- .../RemoteController/RemoteAdminPlugin.cs | 4 +- .../Rest/Inventory/tests/Remote.cs | 2 +- .../Rest/Regions/GETHandler.cs | 4 +- .../Rest/Regions/POSTHandler.cs | 4 +- .../Rest/Regions/RegionDetails.cs | 2 +- .../Rest/Regions/RestRegionPlugin.cs | 2 +- OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | 2 +- .../ScriptEngine/RegionEngineLoader.cs | 4 +- OpenSim/Data/MSSQL/MSSQLEstateData.cs | 2 +- OpenSim/Data/MSSQL/MSSQLRegionData.cs | 4 +- OpenSim/Data/MySQL/MySQLEstateData.cs | 4 +- OpenSim/Data/MySQL/MySQLRegionData.cs | 4 +- OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs | 2 +- OpenSim/Data/MySQL/Tests/MySQLGridTest.cs | 2 +- .../Data/MySQL/Tests/MySQLInventoryTest.cs | 2 +- OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs | 2 +- OpenSim/Data/MySQL/Tests/MySQLUserTest.cs | 2 +- .../Data/NHibernate/NHibernateRegionData.cs | 6 +- .../Tests/NHibernateMsSqlAssetTest.cs | 2 +- .../Tests/NHibernateMsSqlGridTest.cs | 2 +- .../Tests/NHibernateMsSqlInventoryTest.cs | 2 +- .../Tests/NHibernateMsSqlRegionTest.cs | 2 +- .../Tests/NHibernateMsSqlUserTest.cs | 2 +- .../Tests/NHibernateMySQLAssetTest.cs | 2 +- .../Tests/NHibernateMySQLGridTest.cs | 2 +- .../Tests/NHibernateMySQLInventoryTest.cs | 2 +- .../Tests/NHibernateMySQLRegionTest.cs | 2 +- .../Tests/NHibernateMySQLUserTest.cs | 2 +- .../Tests/NHibernateSQLiteAssetTest.cs | 2 +- .../Tests/NHibernateSQLiteGridTest.cs | 2 +- .../Tests/NHibernateSQLiteInventoryTest.cs | 2 +- .../Tests/NHibernateSQLiteRegionTest.cs | 2 +- .../Tests/NHibernateSQLiteUserTest.cs | 2 +- OpenSim/Data/Null/NullDataStore.cs | 4 +- OpenSim/Data/SQLite/SQLiteEstateData.cs | 4 +- OpenSim/Data/SQLite/SQLiteRegionData.cs | 4 +- OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs | 2 +- .../Data/SQLite/Tests/SQLiteInventoryTest.cs | 2 +- OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs | 2 +- OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs | 2 +- OpenSim/Data/Tests/BasicAssetTest.cs | 2 +- OpenSim/Data/Tests/BasicGridTest.cs | 2 +- OpenSim/Data/Tests/BasicInventoryTest.cs | 2 +- OpenSim/Data/Tests/BasicRegionTest.cs | 4 +- OpenSim/Data/Tests/BasicUserTest.cs | 2 +- .../Cache/CryptoGridAssetClient.cs | 10 +- .../Communications/Capabilities/Caps.cs | 2 +- .../Interfaces => Framework}/IMoneyModule.cs | 2 +- OpenSim/Region/Application/HGOpenSimNode.cs | 7 +- OpenSim/Region/Application/OpenSim.cs | 4 +- OpenSim/Region/Application/OpenSimBase.cs | 5 +- .../ClientStack/IClientNetworkServer.cs | 2 +- .../ClientStack/LindenUDP/LLClientView.cs | 27 +-- .../ClientStack/LindenUDP/LLFileTransfer.cs | 4 +- .../ClientStack/LindenUDP/LLImageManager.cs | 2 +- .../ClientStack/LindenUDP/LLUDPServer.cs | 2 +- .../ClientStack/LindenUDP/Tests/MockScene.cs | 2 +- .../ClientStack/RegionApplicationBase.cs | 3 +- .../Hypergrid/HGCommunicationsGridMode.cs | 2 +- .../Hypergrid/HGGridServices.cs | 6 +- .../Hypergrid/HGGridServicesGridMode.cs | 2 +- .../Hypergrid/HGGridServicesStandalone.cs | 2 +- .../Region/DataSnapshot/DataRequestHandler.cs | 2 +- .../DataSnapshot/DataSnapshotManager.cs | 4 +- OpenSim/Region/DataSnapshot/EstateSnapshot.cs | 2 +- .../Interfaces/IDataSnapshotProvider.cs | 2 +- OpenSim/Region/DataSnapshot/LandSnapshot.cs | 4 +- OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 4 +- OpenSim/Region/DataSnapshot/SnapshotStore.cs | 2 +- .../AgentAssetTransactionsManager.cs | 4 +- .../AgentAssetsTransactions.cs | 2 +- .../AssetTransactionModule.cs | 5 +- .../AssetTransaction/AssetXferUploader.cs | 2 +- .../Agent/Capabilities/CapabilitiesModule.cs | 6 +- .../TextureDownload/TextureDownloadModule.cs | 6 +- .../TextureDownload/TextureNotFoundSender.cs | 2 +- .../UserTextureDownloadService.cs | 4 +- .../Agent/TextureSender/J2KDecoderModule.cs | 4 +- .../Agent/TextureSender/TextureSender.cs | 2 +- .../Modules/Agent/Xfer/XferModule.cs | 4 +- .../AvatarFactory/AvatarFactoryModule.cs | 4 +- .../Modules/Avatar/Chat/ChannelState.cs | 4 +- .../Modules/Avatar/Chat/ChatModule.cs | 4 +- .../Modules/Avatar/Chat/IRCBridgeModule.cs | 4 +- .../Modules/Avatar/Chat/IRCConnector.cs | 4 +- .../Modules/Avatar/Chat/RegionState.cs | 4 +- .../Modules/Avatar/Combat/CombatModule.cs | 5 +- .../Avatar/Concierge/ConciergeModule.cs | 4 +- .../Currency/SampleMoney/SampleMoneyModule.cs | 5 +- .../Modules/Avatar/Dialog/DialogModule.cs | 4 +- .../Modules/Avatar/Friends/FriendsModule.cs | 5 +- .../Modules/Avatar/Gestures/GesturesModule.cs | 4 +- .../Modules/Avatar/Groups/GroupsModule.cs | 4 +- .../InstantMessage/InstantMessageModule.cs | 5 +- .../InstantMessage/MessageTransferModule.cs | 5 +- .../Avatar/InstantMessage/PresenceModule.cs | 5 +- .../Archiver/InventoryArchiveReadRequest.cs | 2 +- .../Archiver/InventoryArchiveWriteRequest.cs | 2 +- .../Transfer/InventoryTransferModule.cs | 5 +- .../Modules/Avatar/Lure/LureModule.cs | 5 +- .../Modules/Avatar/ObjectCaps/ObjectAdd.cs | 4 +- .../Avatar/Profiles/AvatarProfilesModule.cs | 4 +- .../Voice/AsterixVoice/AsteriskVoiceModule.cs | 4 +- .../Avatar/Voice/SIPVoice/SIPVoiceModule.cs | 4 +- .../Local/LocalInterregionComms.cs | 5 +- .../REST/RESTInterregionComms.cs | 7 +- .../ContentManagementSystem/AuraMetaEntity.cs | 4 +- .../ContentManagementSystem/BeamMetaEntity.cs | 4 +- .../ContentManagementSystem/CMController.cs | 4 +- .../CMEntityCollection.cs | 4 +- .../ContentManagementSystem/CMModel.cs | 4 +- .../Modules/ContentManagementSystem/CMView.cs | 4 +- .../ContentManagementEntity.cs | 4 +- .../ContentManagementModule.cs | 4 +- .../FileSystemDatabase.cs | 4 +- .../ContentManagementSystem/GitDatabase.cs | 4 +- .../IContentDatabase.cs | 2 +- .../ContentManagementSystem/MetaEntity.cs | 4 +- .../PointMetaEntity.cs | 4 +- .../SceneObjectGroupDiff.cs | 4 +- .../EventQueue/EventQueueGetModule.cs | 77 +++++++- .../Framework/EventQueue/EventQueueHelper.cs | 74 ++++---- .../Framework/InterfaceCommander/Command.cs | 2 +- .../Framework/InterfaceCommander/Commander.cs | 2 +- .../Grid/Interregion/IInterregionModule.cs | 2 +- .../Grid/Interregion/InterregionModule.cs | 4 +- .../Hypergrid/HGStandaloneAssetService.cs | 4 +- .../Hypergrid/HGStandaloneInventoryService.cs | 4 +- .../Modules/Hypergrid/HGWorldMapModule.cs | 6 +- .../InterGrid/OpenGridProtocolModule.cs | 4 +- .../DynamicTexture/DynamicTextureModule.cs | 4 +- .../Scripting/EMailModules/EmailModule.cs | 4 +- .../HttpRequest/ScriptsHttpRequests.cs | 179 ++++++++++-------- .../LoadImageURL/LoadImageURLModule.cs | 4 +- .../VectorRender/VectorRenderModule.cs | 4 +- .../Scripting/WorldComm/WorldCommModule.cs | 8 +- .../Modules/Scripting/XMLRPC/XMLRPCModule.cs | 110 ++++++----- .../World/Archiver/ArchiveReadRequest.cs | 4 +- .../Archiver/ArchiveWriteRequestExecution.cs | 4 +- .../ArchiveWriteRequestPreparation.cs | 4 +- .../Modules/World/Archiver/ArchiverModule.cs | 4 +- .../Modules/World/Archiver/AssetsRequest.cs | 4 +- .../World/Archiver/Tests/ArchiverTests.cs | 4 +- .../World/Estate/EstateManagementModule.cs | 4 +- .../World/Estate/EstateTerrainXferHandler.cs | 2 +- .../Modules/World/Land/LandChannel.cs | 4 +- .../World/Land/LandManagementModule.cs | 4 +- .../Modules/World/Land/LandObject.cs | 4 +- .../Modules/World/NPC/NPCAvatar.cs | 2 +- .../Modules/World/NPC/NPCModule.cs | 4 +- .../World/Permissions/PermissionsModule.cs | 4 +- .../World/Serialiser/IFileSerialiser.cs | 2 +- .../World/Serialiser/SerialiseObjects.cs | 2 +- .../World/Serialiser/SerialiseTerrain.cs | 2 +- .../World/Serialiser/SerialiserModule.cs | 4 +- .../Modules/World/Sound/SoundModule.cs | 4 +- .../Modules/World/Sun/SunModule.cs | 4 +- .../World/Terrain/Effects/CookieCutter.cs | 3 +- .../Effects/DefaultTerrainGenerator.cs | 3 +- .../Modules/World/Terrain/FileLoaders/BMP.cs | 2 +- .../Modules/World/Terrain/FileLoaders/GIF.cs | 2 +- .../FileLoaders/GenericSystemDrawing.cs | 3 +- .../Modules/World/Terrain/FileLoaders/JPEG.cs | 2 +- .../World/Terrain/FileLoaders/LLRAW.cs | 3 +- .../Modules/World/Terrain/FileLoaders/PNG.cs | 2 +- .../World/Terrain/FileLoaders/RAW32.cs | 3 +- .../Modules/World/Terrain/FileLoaders/TIFF.cs | 2 +- .../World/Terrain/FileLoaders/Terragen.cs | 3 +- .../World/Terrain/FloodBrushes/FlattenArea.cs | 2 +- .../World/Terrain/FloodBrushes/LowerArea.cs | 2 +- .../World/Terrain/FloodBrushes/NoiseArea.cs | 3 +- .../World/Terrain/FloodBrushes/RaiseArea.cs | 2 +- .../World/Terrain/FloodBrushes/RevertArea.cs | 2 +- .../World/Terrain/FloodBrushes/SmoothArea.cs | 2 +- .../Modules/World/Terrain/ITerrainEffect.cs | 2 +- .../World/Terrain/ITerrainFloodEffect.cs | 2 +- .../Modules/World/Terrain/ITerrainLoader.cs | 2 +- .../World/Terrain/ITerrainPaintableEffect.cs | 2 +- .../World/Terrain/PaintBrushes/ErodeSphere.cs | 3 +- .../Terrain/PaintBrushes/FlattenSphere.cs | 3 +- .../World/Terrain/PaintBrushes/LowerSphere.cs | 2 +- .../World/Terrain/PaintBrushes/NoiseSphere.cs | 3 +- .../World/Terrain/PaintBrushes/OlsenSphere.cs | 3 +- .../World/Terrain/PaintBrushes/RaiseSphere.cs | 3 +- .../Terrain/PaintBrushes/RevertSphere.cs | 3 +- .../Terrain/PaintBrushes/SmoothSphere.cs | 3 +- .../Terrain/PaintBrushes/WeatherSphere.cs | 3 +- .../Modules/World/Terrain/TerrainModule.cs | 4 +- .../World/Terrain/Tests/TerrainTest.cs | 1 + .../TreePopulator/TreePopulatorModule.cs | 4 +- .../World/Vegetation/VegetationModule.cs | 4 +- .../Modules/World/Wind/WindModule.cs | 4 +- .../World/WorldMap/IMapTileTerrainRenderer.cs | 2 +- .../Modules/World/WorldMap/MapImageModule.cs | 4 +- .../Modules/World/WorldMap/MapSearchModule.cs | 6 +- .../World/WorldMap/ShadedMapTileRenderer.cs | 4 +- .../World/WorldMap/TexturedMapTileRenderer.cs | 4 +- .../Modules/World/WorldMap/WorldMapModule.cs | 6 +- .../Examples/SimpleModule/ComplexObject.cs | 2 +- .../Examples/SimpleModule/CpuCounterObject.cs | 2 +- .../Examples/SimpleModule/FileSystemObject.cs | 2 +- .../Examples/SimpleModule/MyNpcCharacter.cs | 2 +- .../Examples/SimpleModule/RegionModule.cs | 4 +- .../Interfaces/IAgentAssetTransactions.cs | 5 +- .../Interfaces/IAvatarFactory.cs | 4 +- .../Interfaces/ICapabilitiesModule.cs | 2 +- .../Interfaces/ICommand.cs | 2 +- .../Interfaces/ICommandableModule.cs | 2 +- .../Interfaces/ICommander.cs | 2 +- .../Interfaces/IDialogModule.cs | 2 +- .../Interfaces/IDynamicTextureManager.cs | 2 +- .../Interfaces/IEmailModule.cs | 2 +- .../Interfaces/IEntityCreator.cs | 4 +- .../Interfaces/IEntityInventory.cs | 7 +- .../Interfaces/IEstateDataStore.cs | 2 +- .../Interfaces/IEstateModule.cs | 2 +- .../Framework/Interfaces/IEventQueue.cs | 64 +++++++ .../Interfaces/IFriendsModule.cs | 2 +- .../Interfaces/IGroupsModule.cs | 2 +- .../Interfaces/IHttpRequests.cs | 17 +- .../Interfaces/IInterregionComms.cs | 2 +- .../Interfaces/IInventoryTransferModule.cs | 5 +- .../Interfaces/IJ2KDecoder.cs | 2 +- .../Interfaces/ILandChannel.cs | 4 +- .../Interfaces/ILandObject.cs | 4 +- .../Interfaces/IMessageTransferModule.cs | 2 +- .../Interfaces/IPresenceModule.cs | 2 +- .../Interfaces/IRegionArchiverModule.cs | 2 +- .../Interfaces/IRegionDataStore.cs | 4 +- .../Interfaces/IRegionModule.cs | 4 +- .../Interfaces/IRegionSerialiserModule.cs | 4 +- .../Interfaces/IScriptModule.cs | 2 +- .../Interfaces/IServiceRequest.cs} | 24 ++- .../Interfaces/ISoundModule.cs | 2 +- .../Interfaces/ITerrain.cs | 2 +- .../Interfaces/ITerrainChannel.cs | 2 +- .../Interfaces/ITextureSender.cs | 2 +- .../Interfaces/IVegetationModule.cs | 4 +- .../Interfaces/IWindModule.cs | 2 +- .../Interfaces/IWorldComm.cs | 24 ++- .../Interfaces/IXMLRPC.cs | 26 ++- .../Interfaces/IXfer.cs | 2 +- .../ModuleLoader.cs | 88 +-------- .../Scenes/Animation.cs | 2 +- .../Scenes/AnimationSet.cs | 2 +- .../Scenes/AsyncSceneObjectGroupDeleter.cs | 2 +- .../Scenes/AvatarAnimations.cs | 2 +- .../Scenes/EntityBase.cs | 2 +- .../Scenes/EntityManager.cs | 2 +- .../Scenes/EventManager.cs | 7 +- .../Scenes/Hypergrid/HGAssetMapper.cs | 6 +- .../Scenes/Hypergrid/HGScene.Inventory.cs | 6 +- .../Scenes/Hypergrid/HGScene.cs | 6 +- .../Hypergrid/HGSceneCommunicationService.cs | 19 +- .../Scenes/IScenePresenceBody.cs | 2 +- .../Scenes/ReturnInfo.cs | 2 +- .../Scenes/Scene.Inventory.cs | 6 +- .../Scenes/Scene.PacketHandlers.cs | 2 +- .../Scenes/Scene.Permissions.cs | 4 +- .../Scenes/Scene.cs | 26 +-- .../Scenes/SceneBase.cs | 4 +- .../Scenes/SceneCommunicationService.cs | 27 +-- .../Scenes/SceneGraph.cs | 15 +- .../Scenes/SceneManager.cs | 4 +- .../Scenes/SceneObjectGroup.Inventory.cs | 4 +- .../Scenes/SceneObjectGroup.cs | 4 +- .../Scenes/SceneObjectPart.cs | 6 +- .../Scenes/SceneObjectPartInventory.cs | 7 +- .../Scenes/ScenePresence.cs | 14 +- .../Scenes}/SceneXmlLoader.cs | 2 +- .../Scenes/Scripting/IScriptHost.cs | 2 +- .../Scenes/Scripting/NullScriptHost.cs | 2 +- .../Scenes/Scripting/ScriptEngineInterface.cs | 2 +- .../Scenes/Scripting/ScriptEngineLoader.cs | 2 +- .../Scenes/SimStatsReporter.cs | 4 +- .../Scenes}/TerrainChannel.cs | 4 +- .../Scenes}/TerrainUtil.cs | 4 +- .../Scenes/Tests/EntityManagerTests.cs | 4 +- .../Scenes/Tests/SceneObjectBasicTests.cs | 0 .../Scenes/Tests/SceneObjectLinkingTests.cs | 0 .../Scenes/Tests/ScenePresenceTests.cs | 6 +- .../Scenes/Tests/StandaloneTeleportTests.cs | 4 +- .../Scenes}/Types/BasicQuadTreeNode.cs | 4 +- .../Scenes}/Types/UpdateQueue.cs | 4 +- .../Scenes/UndoState.cs | 2 +- .../StorageManager.cs | 4 +- OpenSim/Region/Modules/Python/PythonModule.cs | 4 +- .../Modules/SvnSerialiser/SvnBackupModule.cs | 4 +- .../DefaultEffects/Effects/ChannelDigger.cs | 2 +- .../ScriptEngine/DotNetEngine/EventManager.cs | 5 +- .../DotNetEngine/EventQueueThreadClass.cs | 4 +- .../ScriptEngine/DotNetEngine/ScriptEngine.cs | 5 +- .../DotNetEngine/ScriptManager.cs | 2 +- .../ScriptEngine/Interfaces/IScriptApi.cs | 2 +- .../ScriptEngine/Interfaces/IScriptEngine.cs | 2 +- .../Api/Implementation/AsyncCommandManager.cs | 6 +- .../Shared/Api/Implementation/LSL_Api.cs | 9 +- .../Shared/Api/Implementation/OSSL_Api.cs | 4 +- .../Api/Implementation/Plugins/HttpRequest.cs | 20 +- .../Api/Implementation/Plugins/Listener.cs | 4 +- .../Implementation/Plugins/SensorRepeat.cs | 2 +- .../Api/Implementation/Plugins/XmlRequest.cs | 18 +- .../Shared/Api/Runtime/OSSL_Stub.cs | 2 +- ...Region.ScriptEngine.Shared.Api.Runtime.mdp | 1 + .../ScriptEngine/Shared/CodeTools/Compiler.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 2 +- .../Shared/Instance/ScriptInstance.cs | 4 +- .../Shared/Instance/ScriptSerializer.cs | 4 +- .../ScriptEngine/XEngine/EventManager.cs | 5 +- .../Region/ScriptEngine/XEngine/XEngine.cs | 5 +- .../UserStatistics/ActiveConnectionsAJAX.cs | 2 +- .../Region/UserStatistics/Clients_report.cs | 2 +- .../Region/UserStatistics/Default_Report.cs | 2 +- OpenSim/Region/UserStatistics/LogLinesAJAX.cs | 2 +- OpenSim/Region/UserStatistics/SimStatsAJAX.cs | 2 +- .../Region/UserStatistics/WebStatsModule.cs | 4 +- .../DotNetEngine/Events/LSLEventProvider.cs | 4 +- .../ScriptManager_ScriptLoadUnload.cs | 2 +- .../Engines/DotNetEngine/DotNetEngine.cs | 4 +- OpenSim/ScriptEngine/Shared/IScriptEngine.cs | 4 +- .../Shared/RegionInfoStructure.cs | 4 +- OpenSim/Tests/Common/Mock/TestClient.cs | 4 +- OpenSim/Tests/Common/Mock/TestLandChannel.cs | 2 +- OpenSim/Tests/Common/Mock/TestScene.cs | 4 +- .../Tests/Common/Setup/SceneSetupHelpers.cs | 6 +- prebuild.xml | 152 +++++++++------ 327 files changed, 1102 insertions(+), 919 deletions(-) rename OpenSim/{Region/Interfaces => Framework}/IMoneyModule.cs (98%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IAgentAssetTransactions.cs (94%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IAvatarFactory.cs (95%) rename OpenSim/Region/{Environment => Framework}/Interfaces/ICapabilitiesModule.cs (98%) rename OpenSim/Region/{Environment => Framework}/Interfaces/ICommand.cs (97%) rename OpenSim/Region/{Environment => Framework}/Interfaces/ICommandableModule.cs (97%) rename OpenSim/Region/{Environment => Framework}/Interfaces/ICommander.cs (97%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IDialogModule.cs (99%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IDynamicTextureManager.cs (98%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IEmailModule.cs (97%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IEntityCreator.cs (96%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IEntityInventory.cs (97%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IEstateDataStore.cs (97%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IEstateModule.cs (97%) create mode 100644 OpenSim/Region/Framework/Interfaces/IEventQueue.cs rename OpenSim/Region/{Environment => Framework}/Interfaces/IFriendsModule.cs (98%) rename OpenSim/Region/{ => Framework}/Interfaces/IGroupsModule.cs (98%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IHttpRequests.cs (85%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IInterregionComms.cs (98%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IInventoryTransferModule.cs (95%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IJ2KDecoder.cs (97%) rename OpenSim/Region/{Environment => Framework}/Interfaces/ILandChannel.cs (96%) rename OpenSim/Region/{Environment => Framework}/Interfaces/ILandObject.cs (97%) rename OpenSim/Region/{ => Framework}/Interfaces/IMessageTransferModule.cs (97%) rename OpenSim/Region/{ => Framework}/Interfaces/IPresenceModule.cs (98%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IRegionArchiverModule.cs (98%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IRegionDataStore.cs (97%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IRegionModule.cs (95%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IRegionSerialiserModule.cs (98%) rename OpenSim/Region/{ => Framework}/Interfaces/IScriptModule.cs (97%) rename OpenSim/Region/{Interfaces/IEventQueue.cs => Framework/Interfaces/IServiceRequest.cs} (83%) rename OpenSim/Region/{Environment => Framework}/Interfaces/ISoundModule.cs (97%) rename OpenSim/Region/{Environment => Framework}/Interfaces/ITerrain.cs (98%) rename OpenSim/Region/{Environment => Framework}/Interfaces/ITerrainChannel.cs (97%) rename OpenSim/Region/{Environment => Framework}/Interfaces/ITextureSender.cs (98%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IVegetationModule.cs (96%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IWindModule.cs (97%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IWorldComm.cs (79%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IXMLRPC.cs (77%) rename OpenSim/Region/{Environment => Framework}/Interfaces/IXfer.cs (97%) rename OpenSim/Region/{Environment => Framework}/ModuleLoader.cs (70%) rename OpenSim/Region/{Environment => Framework}/Scenes/Animation.cs (98%) rename OpenSim/Region/{Environment => Framework}/Scenes/AnimationSet.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/AsyncSceneObjectGroupDeleter.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/AvatarAnimations.cs (98%) rename OpenSim/Region/{Environment => Framework}/Scenes/EntityBase.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/EntityManager.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/EventManager.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/Hypergrid/HGAssetMapper.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/Hypergrid/HGScene.Inventory.cs (97%) rename OpenSim/Region/{Environment => Framework}/Scenes/Hypergrid/HGScene.cs (96%) rename OpenSim/Region/{Environment => Framework}/Scenes/Hypergrid/HGSceneCommunicationService.cs (95%) rename OpenSim/Region/{Environment => Framework}/Scenes/IScenePresenceBody.cs (97%) rename OpenSim/Region/{Environment => Framework}/Scenes/ReturnInfo.cs (97%) rename OpenSim/Region/{Environment => Framework}/Scenes/Scene.Inventory.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/Scene.PacketHandlers.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/Scene.Permissions.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/Scene.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/SceneBase.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/SceneCommunicationService.cs (97%) rename OpenSim/Region/{Environment => Framework}/Scenes/SceneGraph.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/SceneManager.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/SceneObjectGroup.Inventory.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/SceneObjectGroup.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/SceneObjectPart.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/SceneObjectPartInventory.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/ScenePresence.cs (99%) rename OpenSim/Region/{Environment/Modules/World/Serialiser => Framework/Scenes}/SceneXmlLoader.cs (99%) rename OpenSim/Region/{Environment => Framework}/Scenes/Scripting/IScriptHost.cs (97%) rename OpenSim/Region/{Environment => Framework}/Scenes/Scripting/NullScriptHost.cs (98%) rename OpenSim/Region/{Environment => Framework}/Scenes/Scripting/ScriptEngineInterface.cs (97%) rename OpenSim/Region/{Environment => Framework}/Scenes/Scripting/ScriptEngineLoader.cs (98%) rename OpenSim/Region/{Environment => Framework}/Scenes/SimStatsReporter.cs (99%) rename OpenSim/Region/{Environment/Modules/World/Terrain => Framework/Scenes}/TerrainChannel.cs (98%) rename OpenSim/Region/{Environment/Modules/World/Terrain => Framework/Scenes}/TerrainUtil.cs (98%) rename OpenSim/Region/{Environment => Framework}/Scenes/Tests/EntityManagerTests.cs (98%) rename OpenSim/Region/{Environment => Framework}/Scenes/Tests/SceneObjectBasicTests.cs (100%) rename OpenSim/Region/{Environment => Framework}/Scenes/Tests/SceneObjectLinkingTests.cs (100%) rename OpenSim/Region/{Environment => Framework}/Scenes/Tests/ScenePresenceTests.cs (98%) rename OpenSim/Region/{Environment => Framework}/Scenes/Tests/StandaloneTeleportTests.cs (98%) rename OpenSim/Region/{Environment => Framework/Scenes}/Types/BasicQuadTreeNode.cs (99%) rename OpenSim/Region/{Environment => Framework/Scenes}/Types/UpdateQueue.cs (98%) rename OpenSim/Region/{Environment => Framework}/Scenes/UndoState.cs (98%) rename OpenSim/Region/{Environment => Framework}/StorageManager.cs (97%) diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index c04336331a..024c910a87 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs @@ -34,6 +34,12 @@ using OpenSim.Framework; using OpenSim.Framework.RegionLoader.Filesystem; using OpenSim.Framework.RegionLoader.Web; +using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture; +using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; +using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; +using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; +using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; + namespace OpenSim.ApplicationPlugins.LoadRegions { public class LoadRegionsPlugin : IApplicationPlugin @@ -74,8 +80,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions regionLoader.SetIniConfigSource(openSim.ConfigSource.Source); RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); - openSim.ModuleLoader.LoadDefaultSharedModules(); - + openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule()); + openSim.ModuleLoader.LoadDefaultSharedModule(new InstantMessageModule()); + openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule()); + openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule()); + openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule()); if (!CheckRegionsForSanity(regionsToLoad)) { m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations"); diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index d9cf5bd901..a0363715e8 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -37,9 +37,9 @@ using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Terrain; -using OpenSim.Region.Environment.Scenes; using System.Collections.Generic; namespace OpenSim.ApplicationPlugins.RemoteController diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs index bd4247369f..4a988340b2 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs @@ -33,7 +33,7 @@ using System.IO; using System.Threading; using System.Xml; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Servers; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs index 35b4d8aeba..8537da5628 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs @@ -44,8 +44,8 @@ using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Communications; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.ApplicationPlugins.Rest; namespace OpenSim.ApplicationPlugins.Rest.Regions diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs index 932f512cb2..ab7e1ece3b 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs @@ -44,8 +44,8 @@ using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Communications; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.ApplicationPlugins.Rest; namespace OpenSim.ApplicationPlugins.Rest.Regions diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs index 21caf84c13..80c2aa308b 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs @@ -31,7 +31,7 @@ using System.Collections; using System.Collections.Generic; using System.Xml.Serialization; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.ApplicationPlugins.Rest.Regions { diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs index 4c24f3ff54..2d13b6b387 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs @@ -43,7 +43,7 @@ using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Communications; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.ApplicationPlugins.Rest; namespace OpenSim.ApplicationPlugins.Rest.Regions diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index ba0d2d1dd5..58dd729a0d 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs @@ -41,7 +41,7 @@ using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Communications; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.ApplicationPlugins.Rest { diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs index 998f017b7d..bc07ca7208 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs @@ -30,8 +30,8 @@ using System.Reflection; using System.Text; using log4net; using Nini.Config; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.ScriptEngine.Shared; namespace OpenSim.ApplicationPlugins.ScriptEngine diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs index 56855f6d2e..8fd47a0c4c 100644 --- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs +++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs @@ -33,7 +33,7 @@ using System.Reflection; using OpenMetaverse; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Data.MSSQL { diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs index 2388207ee2..d77afc9683 100644 --- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs @@ -35,8 +35,8 @@ using System.Reflection; using OpenMetaverse; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Data.MSSQL { diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index 57151b3aad..f811d84e66 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs @@ -35,8 +35,8 @@ using OpenMetaverse; using log4net; using MySql.Data.MySqlClient; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index e1ddb54717..ab55ba5758 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs @@ -36,8 +36,8 @@ using OpenMetaverse; using log4net; using MySql.Data.MySqlClient; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs index 0419e216c6..0f7c9cdcd5 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.MySQL; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.MySQL.Tests diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs index e6df085813..4638bcaee4 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.MySQL; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.MySQL.Tests diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs index 6f95c6cb32..8c7d82083e 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.MySQL; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; using log4net; diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs index aed4ceaf33..71e73c2f6c 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.MySQL; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.MySQL.Tests diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs index c036f6ca20..8448dd7b1c 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.MySQL; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.MySQL.Tests diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs index b8b1863917..29f4106daf 100644 --- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs +++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs @@ -36,9 +36,9 @@ using log4net; using NHibernate; using NHibernate.Criterion; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; -using Environment=NHibernate.Cfg.Environment; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; +using Environment = NHibernate.Cfg.Environment; namespace OpenSim.Data.NHibernate { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs index b08bed9bab..d6c7f8f66d 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.NHibernate.Tests diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs index 01d3266fc6..e70b32b6fd 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs @@ -32,7 +32,7 @@ using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; using OpenSim.Data.NHibernate; diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs index 2754fe1bab..7500574511 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; using log4net; diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs index 19d8a371c4..add88838b4 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.NHibernate.Tests diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs index d796bde86d..01b0236638 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.NHibernate.Tests diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs index 9a47a0f900..93b92ed208 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.NHibernate.Tests diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs index 0abb8ee345..c845d2c8b2 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs @@ -32,7 +32,7 @@ using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; using OpenSim.Data.NHibernate; diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs index bea6c7d07f..f91d058728 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; using log4net; diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs index 6e09f2a278..4db83750df 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.NHibernate.Tests diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs index df6a5122c3..3bc0f4bbd1 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.NHibernate.Tests diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs index a5aa6496d0..77bbb0825c 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.NHibernate.Tests diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs index a7a0c9302a..6e7d7afdf2 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs @@ -32,7 +32,7 @@ using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; using OpenSim.Data.NHibernate; diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs index 23c1ec72f7..45c77f7df0 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; using log4net; diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs index 9e77d4772d..6e84110258 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.NHibernate.Tests diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs index 1e8ba3c6c2..90edbc203b 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.NHibernate; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.NHibernate.Tests diff --git a/OpenSim/Data/Null/NullDataStore.cs b/OpenSim/Data/Null/NullDataStore.cs index 94ad4afbae..9b1c0e2bae 100644 --- a/OpenSim/Data/Null/NullDataStore.cs +++ b/OpenSim/Data/Null/NullDataStore.cs @@ -28,8 +28,8 @@ using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Data.Null { diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs index f95932d397..46d29a3ed7 100644 --- a/OpenSim/Data/SQLite/SQLiteEstateData.cs +++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs @@ -35,8 +35,8 @@ using OpenMetaverse; using Mono.Data.SqliteClient; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Data.SQLite { diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 306dcb8fa7..89308db92c 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs @@ -36,8 +36,8 @@ using OpenMetaverse; using log4net; using Mono.Data.SqliteClient; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Data.SQLite { diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs index 993f5f5fe6..0de965d628 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.SQLite; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.SQLite.Tests diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs index 571aa85379..07b0dab12f 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.SQLite; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; using log4net; diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs index b188ead5c5..86a11926df 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.SQLite; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.SQLite.Tests diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs index 68a10fb1be..0415219fe5 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs @@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data.Tests; using OpenSim.Data.SQLite; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.SQLite.Tests diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs index 5993f961da..10cd35fec9 100644 --- a/OpenSim/Data/Tests/BasicAssetTest.cs +++ b/OpenSim/Data/Tests/BasicAssetTest.cs @@ -31,7 +31,7 @@ using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenSim.Data; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.Tests diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs index b9cf4cfd84..adf3879039 100644 --- a/OpenSim/Data/Tests/BasicGridTest.cs +++ b/OpenSim/Data/Tests/BasicGridTest.cs @@ -32,7 +32,7 @@ using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenSim.Data; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.Tests diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs index 2e6226ffbe..1e13ec48b6 100644 --- a/OpenSim/Data/Tests/BasicInventoryTest.cs +++ b/OpenSim/Data/Tests/BasicInventoryTest.cs @@ -31,7 +31,7 @@ using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.Tests diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs index a0591fa861..70d8f8a97e 100644 --- a/OpenSim/Data/Tests/BasicRegionTest.cs +++ b/OpenSim/Data/Tests/BasicRegionTest.cs @@ -33,8 +33,8 @@ using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenSim.Framework; using OpenSim.Data; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Land; using OpenMetaverse; diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs index e7e6b840e0..5464ade1cb 100644 --- a/OpenSim/Data/Tests/BasicUserTest.cs +++ b/OpenSim/Data/Tests/BasicUserTest.cs @@ -34,7 +34,7 @@ using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenSim.Data; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Data.Tests diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs index 1b3e70d4d9..038c5917d1 100644 --- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs @@ -163,8 +163,11 @@ namespace OpenSim.Framework.Communications.Cache passwordIterations); // Use the password to generate pseudo-random bytes for the encryption - // key. Specify the size of the key in bytes (instead of bits). + // key. Specify the size of the key in bytes (instead + // of bits). + #pragma warning disable 0618 byte[] keyBytes = password.GetBytes(keySize / 8); + #pragma warning restore 0618 // Create uninitialized Rijndael encryption object. RijndaelManaged symmetricKey = new RijndaelManaged(); @@ -276,8 +279,11 @@ namespace OpenSim.Framework.Communications.Cache passwordIterations); // Use the password to generate pseudo-random bytes for the encryption - // key. Specify the size of the key in bytes (instead of bits). + // key. Specify the size of the key in bytes (instead + // of bits). + #pragma warning disable 0618 byte[] keyBytes = password.GetBytes(keySize / 8); + #pragma warning restore 0618 // Create uninitialized Rijndael encryption object. RijndaelManaged symmetricKey = new RijndaelManaged(); diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index a370eea9f5..25a69f778e 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs @@ -35,7 +35,7 @@ using log4net; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; using OpenSim.Framework; -using OpenSim.Region.Interfaces; +// using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Framework.Communications.Capabilities { diff --git a/OpenSim/Region/Interfaces/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs similarity index 98% rename from OpenSim/Region/Interfaces/IMoneyModule.cs rename to OpenSim/Framework/IMoneyModule.cs index 5dfb64c54a..7904e94316 100644 --- a/OpenSim/Region/Interfaces/IMoneyModule.cs +++ b/OpenSim/Framework/IMoneyModule.cs @@ -29,7 +29,7 @@ using System; using OpenSim.Framework; using OpenMetaverse; -namespace OpenSim.Region.Interfaces +namespace OpenSim.Framework { public delegate void ObjectPaid(UUID objectID, UUID agentID, int amount); public interface IMoneyModule diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index 358370b852..4941fb45e0 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs @@ -44,9 +44,10 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.Hypergrid; using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Scenes.Hypergrid; +using OpenSim.Region.Framework; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Scenes.Hypergrid; using Timer = System.Timers.Timer; diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 33621a9cad..0cd708b477 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -39,8 +39,8 @@ using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Statistics; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver; using Timer=System.Timers.Timer; diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 89f16d6fac..a7ff0e206f 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -45,8 +45,9 @@ using OpenSim.Region.ClientStack; using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.OGS1; using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; namespace OpenSim diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs index 2d0630bbec..00733890eb 100644 --- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs +++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs @@ -29,7 +29,7 @@ using System.Net; using System.Net.Sockets; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Communications.Cache; namespace OpenSim.Region.ClientStack diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 42dbbeea88..59df3f11af 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -41,9 +41,8 @@ using OpenSim.Framework; using OpenSim.Framework.Client; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Statistics; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using Timer = System.Timers.Timer; namespace OpenSim.Region.ClientStack.LindenUDP @@ -475,7 +474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_PacketHandler.OnPacketStats += PopulateStats; RegisterLocalPacketHandlers(); - m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface()); + m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface()); } public void SetDebugPacketLevel(int newDebugPacketLevel) @@ -1214,20 +1213,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP { dialog = 17; - OSD Item = Environment.EventQueueHelper.ChatterboxInvitation( + eq.ChatterboxInvitation( new UUID("00000000-68f9-1111-024e-222222111123"), "OpenSimulator Testing", fromAgent, message, toAgent, fromName, dialog, 0, false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket); - eq.Enqueue(Item, toAgent); - m_log.Info("########### eq ChatterboxInvitation #############\n" + Item); - - Item = Environment.EventQueueHelper.ChatterBoxSessionAgentListUpdates( + eq.ChatterBoxSessionAgentListUpdates( new UUID("00000000-68f9-1111-024e-222222111123"), - fromAgent, false, false, false); - - eq.Enqueue(Item, toAgent); - m_log.Info("########### eq ChatterBoxSessionAgentListUpdates #############\n" + Item); + fromAgent, toAgent, false, false, false); } System.Console.WriteLine("SendInstantMessage: " + msg); @@ -3193,9 +3186,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP IEventQueue eq = Scene.RequestModuleInterface(); if (eq != null) { - OSD Item = Environment.EventQueueHelper.ParcelProperties(updatePacket); - - eq.Enqueue(Item, this.AgentId); + eq.ParcelProperties(updatePacket, this.AgentId); } } catch (Exception ex) @@ -7608,9 +7599,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP IEventQueue eq = Scene.RequestModuleInterface(); if (eq != null) { - OSD Item = Environment.EventQueueHelper.GroupMembership(Groupupdate); - - eq.Enqueue(Item, this.AgentId); + eq.GroupMembership(Groupupdate, this.AgentId); } } catch (Exception ex) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs index d2d86b9320..b801f7a302 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs @@ -35,8 +35,8 @@ using OpenSim.Framework; using OpenSim.Framework.Client; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Statistics; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.ClientStack.LindenUDP { diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs index f903c45db6..9b71770491 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using C5; using OpenSim.Framework.Communications.Cache; using OpenMetaverse.Imaging; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 1615767071..f53d485182 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -36,7 +36,7 @@ using log4net; using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.ClientStack.LindenUDP { diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs index 6880973aba..90d7d63142 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs @@ -29,7 +29,7 @@ using System.Xml; using Nini.Config; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.ClientStack.LindenUDP.Tests { diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index cc3edff594..0921dbdf8b 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -36,8 +36,9 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; +using OpenSim.Region.Framework; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Physics.Manager; namespace OpenSim.Region.ClientStack diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs index eaaa7d2b8a..c4d48a93e9 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs @@ -34,7 +34,7 @@ using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Communications.OGS1; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Communications.Hypergrid { diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs index 961ecb1828..a39161b94c 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs @@ -52,9 +52,9 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.OGS1; -using OpenSim.Region.Environment.Modules.Framework; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Interfaces; +// using OpenSim.Region.Environment.Modules.Framework; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Communications.Hypergrid { diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs index b64a07056f..b1f9f634c6 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs @@ -35,7 +35,7 @@ using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; using OpenSim.Region.Communications.OGS1; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs index c160696657..27a7a0e6d1 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs @@ -42,7 +42,7 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.OGS1; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; using Nwc.XmlRpc; diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index e2ea546716..9af8914d34 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs @@ -31,7 +31,7 @@ using System.Collections; using System.Reflection; using System.Xml; using log4net; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Communications.Capabilities; using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using OpenMetaverse; diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index 782b4310ce..735e14b611 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs @@ -39,8 +39,8 @@ using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Region.DataSnapshot.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse.Packets; namespace OpenSim.Region.DataSnapshot diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs index 8e7fa46ffa..6865f49978 100644 --- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs @@ -30,7 +30,7 @@ using System.Xml; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.DataSnapshot.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.DataSnapshot.Providers { diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs index 1519355e7d..7762148800 100644 --- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs +++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs @@ -28,7 +28,7 @@ using System; using System.Xml; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.DataSnapshot.Interfaces { diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs index 1a7da1b865..bfc45fc2e5 100644 --- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs @@ -33,9 +33,9 @@ using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Region.DataSnapshot.Interfaces; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Environment.Modules.World.Land; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse.Packets; using OpenSim.Framework.Communications.Cache; diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs index 6dc1e9c7cf..6f7ff6bdf9 100644 --- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs @@ -31,8 +31,8 @@ using System.Reflection; using System.Xml; using log4net; using OpenSim.Region.DataSnapshot.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Land; using OpenSim.Framework; using OpenMetaverse; diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs index dd30d8aefb..22fe0674ac 100644 --- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs +++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using System.Text; using System.Xml; using System.IO; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.DataSnapshot.Interfaces; using OpenMetaverse; diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs index f9f44f0ae0..82325b7641 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs @@ -30,8 +30,8 @@ using System.Collections.Generic; //using log4net; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction { diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs index 7f4bb0b558..adfbbad6fd 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Communications.Cache; namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs index d98d07d4d0..1eb6795879 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs @@ -30,9 +30,8 @@ using System.Collections.Generic; using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction { diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs index 5387165b18..e1e1065161 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs @@ -33,7 +33,7 @@ using OpenMetaverse; using OpenMetaverse.Packets; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction { diff --git a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs index 76b60fd2f4..861e9f4808 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs @@ -34,8 +34,8 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Capabilities; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using Caps = OpenSim.Framework.Communications.Capabilities.Caps; namespace OpenSim.Region.Environment.Modules.Agent.Capabilities @@ -100,7 +100,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Capabilities caps.ItemUpdatedCall = m_scene.CapsUpdateInventoryItemAsset; caps.TaskScriptUpdatedCall = m_scene.CapsUpdateTaskInventoryScriptAsset; caps.CAPSFetchInventoryDescendents = m_scene.HandleFetchInventoryDescendentsCAPS; - caps.GetClient = m_scene.m_sceneGraph.GetControllingClient; + caps.GetClient = m_scene.SceneContents.GetControllingClient; m_capsHandlers[agentId] = caps; } diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs index 6bb61e2b43..47902958f6 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs @@ -31,10 +31,10 @@ using System.Threading; using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Communications.Cache; -using BlockingQueue = OpenSim.Framework.BlockingQueue; +using BlockingQueue = OpenSim.Framework.BlockingQueue; namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload { diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index 34ddee6d2a..51aa48e0d7 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs @@ -30,7 +30,7 @@ using log4net; using OpenMetaverse; using OpenMetaverse.Packets; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload { diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs index e0790a2b1e..38d96db2be 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs @@ -32,8 +32,8 @@ using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications.Limit; using OpenSim.Framework.Statistics; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload { diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs index cf76ebc2b4..852459279e 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs @@ -36,8 +36,8 @@ using Nini.Config; using OpenMetaverse; using OpenMetaverse.Imaging; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Agent.TextureSender { diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs index f9a10bfc73..7d7efda4d1 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs @@ -30,7 +30,7 @@ using System.Reflection; using OpenMetaverse.Packets; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.Agent.TextureSender { diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs index 5b6c2a6858..1d18b4b0d0 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs @@ -30,8 +30,8 @@ using System.Collections.Generic; using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Agent.Xfer { diff --git a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 013301a58a..1ac0807c96 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs @@ -35,8 +35,8 @@ using log4net; using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs index 8f1ad00ecf..dfa1caa6c7 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs @@ -32,8 +32,8 @@ using System.Text.RegularExpressions; using log4net; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Chat { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 110916668b..f234b75548 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs @@ -36,8 +36,8 @@ using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Chat { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs index 2fafe9becd..ccd81c75a7 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs @@ -33,8 +33,8 @@ using log4net; using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Chat { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs index e1c0ac48f7..c3cafb0a2e 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs @@ -37,8 +37,8 @@ using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Chat { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs index b5cc3be097..78f4265246 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs @@ -32,8 +32,8 @@ using System.Text.RegularExpressions; using log4net; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Chat { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs index 6a09f2b50b..f0323199e1 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs @@ -37,9 +37,8 @@ using log4net; using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Communications.Cache; namespace OpenSim.Region.Environment.Modules.Avatar.Combat.CombatModule diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs index 7cfe2f92a4..5ac5dbe219 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs @@ -41,8 +41,8 @@ using Nwc.XmlRpc; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.Avatar.Chat; namespace OpenSim.Region.Environment.Modules.Avatar.Concierge diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index 07e62e20fc..1ec5e9b0c9 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs @@ -39,9 +39,8 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs index 4f8da9ad12..d3ac2c03af 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs @@ -31,8 +31,8 @@ using log4net; using Nini.Config; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Dialog { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs index d54cf27bcd..0ed962e283 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs @@ -36,9 +36,8 @@ using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Friends { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs index 5ff62020dd..969c1d8cb9 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs @@ -31,8 +31,8 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using System.Reflection; namespace OpenSim.Region.Environment.Modules.Avatar.Gestures diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs index dbb645e0a5..e6549122c8 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs @@ -32,8 +32,8 @@ using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Groups { diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs index 747469bd79..3a1b2828e4 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs @@ -36,9 +36,8 @@ using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Client; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage { diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs index dec4ca05ea..347c30591a 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs @@ -36,9 +36,8 @@ using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Client; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage { diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs index a7816b058d..c84d3d594a 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs @@ -36,9 +36,8 @@ using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Client; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index dcfcba32c6..3a5820257f 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs @@ -32,7 +32,7 @@ using System.IO.Compression; using System.Reflection; using System.Xml; using OpenMetaverse; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Archiver; using OpenSim.Framework; using OpenSim.Framework.Communications; diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 017ebcc040..e23f2a88e9 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs @@ -32,7 +32,7 @@ using System.IO.Compression; using System.Reflection; using System.Xml; using OpenMetaverse; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Archiver; using OpenSim.Framework; using OpenSim.Framework.Communications; diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 20ea030b6b..62fb3a268a 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs @@ -33,9 +33,8 @@ using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Communications.Cache; namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer diff --git a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs index 7bb6843ae1..79d5409e58 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs @@ -37,9 +37,8 @@ using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Client; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Lure { diff --git a/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs index 56b6d75ec3..c853582fbe 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs @@ -34,8 +34,8 @@ using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Framework; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using Caps = OpenSim.Framework.Communications.Capabilities.Caps; namespace OpenSim.Region.Environment.Modules.Avatar.ObjectCaps diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs index a9415ce93a..a7e9849175 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs @@ -32,8 +32,8 @@ using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Profiles { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs index e3a9a45dfc..33d7135405 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs @@ -36,8 +36,8 @@ using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using Caps=OpenSim.Framework.Communications.Capabilities.Caps; namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs index bd89175721..e4d9b7c002 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs @@ -35,8 +35,8 @@ using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using Caps=OpenSim.Framework.Communications.Capabilities.Caps; namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice diff --git a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs index 62f6df075d..cb60d3f0f9 100644 --- a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs +++ b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs @@ -38,9 +38,8 @@ using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Communications.Local { diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs index b4302fd746..cfcd618161 100644 --- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs +++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs @@ -42,10 +42,9 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Scenes.Hypergrid; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Scenes.Hypergrid; using OpenSim.Region.Environment.Modules.Communications.Local; namespace OpenSim.Region.Environment.Modules.Communications.REST diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs index 64b48fef3a..9695fb8ef4 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs @@ -44,8 +44,8 @@ using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs index d0015f7fff..3b1a45e5d0 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs @@ -44,8 +44,8 @@ using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs index dfca655285..5a86d48798 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs @@ -43,8 +43,8 @@ using OpenMetaverse; using OpenSim; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs index c1f8a8a164..cfd5cde20f 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs @@ -46,8 +46,8 @@ using Nini.Config; using OpenSim; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs index 02e77bb67f..6399608a17 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs @@ -43,8 +43,8 @@ using OpenMetaverse; using OpenSim; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs index 88f4a6771c..e5c9bb3292 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs @@ -43,8 +43,8 @@ using OpenMetaverse; using OpenSim; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs index d0b59296ae..2ea5ebc04a 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs @@ -43,8 +43,8 @@ using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs index f52c3b8fb1..417cbcec01 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs @@ -42,8 +42,8 @@ using Nini.Config; using OpenSim; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs index 3a8e3747c3..65db153493 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs @@ -45,10 +45,10 @@ using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Serialiser; using OpenSim.Region.Environment.Modules.World.Terrain; -using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs index 9fd542c4d7..4209dab810 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs @@ -46,10 +46,10 @@ using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Serialiser; using OpenSim.Region.Environment.Modules.World.Terrain; -using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs index 638172b37b..79dc86e94c 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs @@ -37,7 +37,7 @@ using System; using OpenMetaverse; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using Nini.Config; namespace OpenSim.Region.Environment.Modules.ContentManagement diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs index d654a1a2cd..c8f8c2ff11 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs @@ -44,8 +44,8 @@ using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs index 5db95455a9..d6ba92f06a 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs @@ -44,8 +44,8 @@ using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs index 79e970df9e..225a6824db 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs @@ -42,8 +42,8 @@ using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using log4net; diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs index bc4c5b99ea..fb303218d7 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs @@ -34,6 +34,7 @@ using System.Reflection; using System.Threading; using System.Xml; using OpenMetaverse; +using OpenMetaverse.Packets; using OpenMetaverse.StructuredData; using log4net; using Nini.Config; @@ -42,9 +43,8 @@ using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OSD = OpenMetaverse.StructuredData.OSD; using OSDMap = OpenMetaverse.StructuredData.OSDMap; @@ -555,5 +555,76 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue return new OSDString("shutdown404!"); } + + public void DisableSimulator(ulong handle, UUID avatarID) + { + OSD item = EventQueueHelper.DisableSimulator(handle); + Enqueue(item, avatarID); + } + + public void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID) + { + OSD item = EventQueueHelper.EnableSimulator(handle, endPoint); + Enqueue(item, avatarID); + } + + public void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath) + { + OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath); + Enqueue(item, avatarID); + } + + public void TeleportFinishEvent(ulong regionHandle, byte simAccess, + IPEndPoint regionExternalEndPoint, + uint locationID, uint flags, string capsURL, + UUID avatarID) + { + OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint, + locationID, flags, capsURL, avatarID); + Enqueue(item, avatarID); + } + + public void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, + IPEndPoint newRegionExternalEndPoint, + string capsURL, UUID avatarID, UUID sessionID) + { + OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint, + capsURL, avatarID, sessionID); + Enqueue(item, avatarID); + } + + public void ChatterboxInvitation(UUID sessionID, string sessionName, + UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, + uint timeStamp, bool offline, int parentEstateID, Vector3 position, + uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket) + { + OSD item = EventQueueHelper.ChatterboxInvitation(sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, + timeStamp, offline, parentEstateID, position, ttl, transactionID, + fromGroup, binaryBucket); + Enqueue(item, toAgent); + m_log.InfoFormat("########### eq ChatterboxInvitation #############\n{0}", item); + + } + + public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, + bool isModerator, bool textMute) + { + OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat, + isModerator, textMute); + Enqueue(item, toAgent); + m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item); + } + + public void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID) + { + OSD item = Environment.EventQueueHelper.ParcelProperties(parcelPropertiesPacket); + Enqueue(item, avatarID); + } + + public void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID) + { + OSD item = EventQueueHelper.GroupMembership(groupUpdate); + Enqueue(item, avatarID); + } } } diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs index 546d9d1fd2..b38ddba5cf 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs @@ -71,11 +71,11 @@ namespace OpenSim.Region.Environment return llsdEvent; } - public static OSD EnableSimulator(ulong Handle, IPEndPoint endPoint) + public static OSD EnableSimulator(ulong handle, IPEndPoint endPoint) { OSDMap llsdSimInfo = new OSDMap(3); - llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(Handle))); + llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle))); llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes())); llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port)); @@ -88,11 +88,11 @@ namespace OpenSim.Region.Environment return buildEvent("EnableSimulator", llsdBody); } - public static OSD DisableSimulator(ulong Handle) + public static OSD DisableSimulator(ulong handle) { //OSDMap llsdSimInfo = new OSDMap(1); - //llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(Handle))); + //llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(handle))); //OSDArray arr = new OSDArray(1); //arr.Add(llsdSimInfo); @@ -103,57 +103,57 @@ namespace OpenSim.Region.Environment return buildEvent("DisableSimulator", llsdBody); } - public static OSD CrossRegion(ulong Handle, Vector3 pos, Vector3 lookAt, - IPEndPoint newRegionExternalEndPoint, - string capsURL, UUID AgentID, UUID SessionID) + public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, + IPEndPoint newRegionExternalEndPoint, + string capsURL, UUID agentID, UUID sessionID) { - OSDArray LookAtArr = new OSDArray(3); - LookAtArr.Add(OSD.FromReal(lookAt.X)); - LookAtArr.Add(OSD.FromReal(lookAt.Y)); - LookAtArr.Add(OSD.FromReal(lookAt.Z)); + OSDArray lookAtArr = new OSDArray(3); + lookAtArr.Add(OSD.FromReal(lookAt.X)); + lookAtArr.Add(OSD.FromReal(lookAt.Y)); + lookAtArr.Add(OSD.FromReal(lookAt.Z)); - OSDArray PositionArr = new OSDArray(3); - PositionArr.Add(OSD.FromReal(pos.X)); - PositionArr.Add(OSD.FromReal(pos.Y)); - PositionArr.Add(OSD.FromReal(pos.Z)); + OSDArray positionArr = new OSDArray(3); + positionArr.Add(OSD.FromReal(pos.X)); + positionArr.Add(OSD.FromReal(pos.Y)); + positionArr.Add(OSD.FromReal(pos.Z)); - OSDMap InfoMap = new OSDMap(2); - InfoMap.Add("LookAt", LookAtArr); - InfoMap.Add("Position", PositionArr); + OSDMap infoMap = new OSDMap(2); + infoMap.Add("LookAt", lookAtArr); + infoMap.Add("Position", positionArr); - OSDArray InfoArr = new OSDArray(1); - InfoArr.Add(InfoMap); + OSDArray infoArr = new OSDArray(1); + infoArr.Add(infoMap); - OSDMap AgentDataMap = new OSDMap(2); - AgentDataMap.Add("AgentID", OSD.FromUUID(AgentID)); - AgentDataMap.Add("SessionID", OSD.FromUUID(SessionID)); + OSDMap agentDataMap = new OSDMap(2); + agentDataMap.Add("AgentID", OSD.FromUUID(agentID)); + agentDataMap.Add("SessionID", OSD.FromUUID(sessionID)); - OSDArray AgentDataArr = new OSDArray(1); - AgentDataArr.Add(AgentDataMap); + OSDArray agentDataArr = new OSDArray(1); + agentDataArr.Add(agentDataMap); - OSDMap RegionDataMap = new OSDMap(4); - RegionDataMap.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(Handle))); - RegionDataMap.Add("SeedCapability", OSD.FromString(capsURL)); - RegionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes())); - RegionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port)); + OSDMap regionDataMap = new OSDMap(4); + regionDataMap.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(handle))); + regionDataMap.Add("SeedCapability", OSD.FromString(capsURL)); + regionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes())); + regionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port)); - OSDArray RegionDataArr = new OSDArray(1); - RegionDataArr.Add(RegionDataMap); + OSDArray regionDataArr = new OSDArray(1); + regionDataArr.Add(regionDataMap); OSDMap llsdBody = new OSDMap(3); - llsdBody.Add("Info", InfoArr); - llsdBody.Add("AgentData", AgentDataArr); - llsdBody.Add("RegionData", RegionDataArr); + llsdBody.Add("Info", infoArr); + llsdBody.Add("AgentData", agentDataArr); + llsdBody.Add("RegionData", regionDataArr); return buildEvent("CrossedRegion", llsdBody); } public static OSD TeleportFinishEvent( ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, - uint locationID, uint flags, string capsURL, UUID AgentID) + uint locationID, uint flags, string capsURL, UUID agentID) { OSDMap info = new OSDMap(); - info.Add("AgentID", OSD.FromUUID(AgentID)); + info.Add("AgentID", OSD.FromUUID(agentID)); info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this? info.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(regionHandle))); info.Add("SeedCapability", OSD.FromString(capsURL)); diff --git a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs b/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs index 6642bdcf6d..0ad95aebad 100644 --- a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs +++ b/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander { diff --git a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs index 1da11774dd..31a67f7244 100644 --- a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs +++ b/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs @@ -31,7 +31,7 @@ using System.Reflection; using System.Text; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander { diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs index b0d44d775d..edf1231c02 100644 --- a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs +++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs @@ -26,7 +26,7 @@ */ using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Grid.Interregion { diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs index acd0e5c529..cb571e4616 100644 --- a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs +++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs @@ -32,8 +32,8 @@ using System.Runtime.Remoting.Channels; using System.Runtime.Remoting.Channels.Tcp; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Grid.Interregion { diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs index 285a01916d..4cb1c2001c 100644 --- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs +++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs @@ -40,8 +40,8 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Grid.AssetServer; using OpenSim.Data; diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs index b10582b3d7..54ba76160e 100644 --- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs +++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs @@ -37,8 +37,8 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Hypergrid { diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs index e642b7fba9..1d9182ef28 100644 --- a/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs +++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs @@ -47,10 +47,10 @@ using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Scenes.Types; using OpenSim.Region.Environment.Modules.World.WorldMap; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Types; using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using OSD = OpenMetaverse.StructuredData.OSD; diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index f5b2823cad..12a76de86f 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs @@ -44,8 +44,8 @@ using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OSD = OpenMetaverse.StructuredData.OSD; using OSDMap = OpenMetaverse.StructuredData.OSDMap; diff --git a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs index bddf10d837..f498f9a197 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs @@ -33,8 +33,8 @@ using OpenMetaverse; using OpenMetaverse.Imaging; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture { diff --git a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs index 5a715f5f8f..81ce761d5d 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs @@ -31,8 +31,8 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using log4net; using Nini.Config; using DotNetOpenMail; diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs index eb9b32257e..821c60ebd2 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs @@ -35,8 +35,8 @@ using OpenMetaverse; using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using System.Collections; /***************************************************** @@ -84,14 +84,14 @@ using System.Collections; namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest { - public class HttpRequestModule : IRegionModule, IHttpRequests + public class HttpRequestModule : IRegionModule, IHttpRequestModule { private object HttpListLock = new object(); private int httpTimeout = 30000; private string m_name = "HttpScriptRequests"; - private string m_proxyurl = ""; - private string m_proxyexcepts = ""; + private string m_proxyurl = ""; + private string m_proxyexcepts = ""; // private Dictionary m_pendingRequests; @@ -102,7 +102,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest { } - #region IHttpRequests Members + #region IHttpRequestModule Members public UUID MakeHttpRequest(string url, string parameters, string body) { @@ -125,22 +125,22 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest { switch (Int32.Parse(parms[i])) { - case HttpRequestClass.HTTP_METHOD: + case (int)HttpRequestConstants.HTTP_METHOD: - htc.httpMethod = parms[i + 1]; + htc.HttpMethod = parms[i + 1]; break; - case HttpRequestClass.HTTP_MIMETYPE: + case (int)HttpRequestConstants.HTTP_MIMETYPE: - htc.httpMIMEType = parms[i + 1]; + htc.HttpMIMEType = parms[i + 1]; break; - case HttpRequestClass.HTTP_BODY_MAXLENGTH: + case (int)HttpRequestConstants.HTTP_BODY_MAXLENGTH: // TODO implement me break; - case HttpRequestClass.HTTP_VERIFY_CERT: + case (int)HttpRequestConstants.HTTP_VERIFY_CERT: // TODO implement me break; @@ -148,22 +148,22 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest } } - htc.localID = localID; - htc.itemID = itemID; - htc.url = url; - htc.reqID = reqID; - htc.httpTimeout = httpTimeout; - htc.outbound_body = body; - htc.response_headers = headers; - htc.proxyurl = m_proxyurl; - htc.proxyexcepts = m_proxyexcepts; + htc.LocalID = localID; + htc.ItemID = itemID; + htc.Url = url; + htc.ReqID = reqID; + htc.HttpTimeout = httpTimeout; + htc.OutboundBody = body; + htc.ResponseHeaders = headers; + htc.proxyurl = m_proxyurl; + htc.proxyexcepts = m_proxyexcepts; lock (HttpListLock) { m_pendingRequests.Add(reqID, htc); } - htc.process(); + htc.Process(); return reqID; } @@ -193,7 +193,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest * it will need some refactoring and this works 'enough' right now */ - public HttpRequestClass GetNextCompletedRequest() + public IServiceRequest GetNextCompletedRequest() { lock (HttpListLock) { @@ -203,7 +203,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest if (m_pendingRequests.TryGetValue(luid, out tmpReq)) { - if (tmpReq.finished) + if (tmpReq.Finished) { return tmpReq; } @@ -235,10 +235,10 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest { m_scene = scene; - m_scene.RegisterModuleInterface(this); + m_scene.RegisterModuleInterface(this); - m_proxyurl = config.Configs["Startup"].GetString("HttpProxy"); - m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions"); + m_proxyurl = config.Configs["Startup"].GetString("HttpProxy"); + m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions"); m_pendingRequests = new Dictionary(); } @@ -264,45 +264,64 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest #endregion } - public class HttpRequestClass + public class HttpRequestClass: IServiceRequest { // Constants for parameters - public const int HTTP_BODY_MAXLENGTH = 2; - public const int HTTP_METHOD = 0; - public const int HTTP_MIMETYPE = 1; - public const int HTTP_VERIFY_CERT = 3; - public bool finished; - public int httpBodyMaxLen = 2048; // not implemented + // public const int HTTP_BODY_MAXLENGTH = 2; + // public const int HTTP_METHOD = 0; + // public const int HTTP_MIMETYPE = 1; + // public const int HTTP_VERIFY_CERT = 3; + private bool _finished; + public bool Finished + { + get { return _finished; } + } + // public int HttpBodyMaxLen = 2048; // not implemented // Parameter members and default values - public string httpMethod = "GET"; - public string httpMIMEType = "text/plain;charset=utf-8"; + public string HttpMethod = "GET"; + public string HttpMIMEType = "text/plain;charset=utf-8"; + public int HttpTimeout; + // public bool HttpVerifyCert = true; // not implemented private Thread httpThread; - public int httpTimeout; - public bool httpVerifyCert = true; // not implemented // Request info - public UUID itemID; - public uint localID; - public DateTime next; - public string outbound_body; - public UUID reqID; - public HttpWebRequest request; - public string response_body; - public List response_metadata; - public Dictionary response_headers; - public int status; - public string url; + private UUID _itemID; + public UUID ItemID + { + get { return _itemID; } + set { _itemID = value; } + } + private uint _localID; + public uint LocalID + { + get { return _localID; } + set { _localID = value; } + } + public DateTime Next; public string proxyurl; public string proxyexcepts; + public string OutboundBody; + private UUID _reqID; + public UUID ReqID + { + get { return _reqID; } + set { _reqID = value; } + } + public HttpWebRequest Request; + public string ResponseBody; + public List ResponseMetadata; + public Dictionary ResponseHeaders; + public int Status; + public string Url; - public void process() + public void Process() { httpThread = new Thread(SendRequest); httpThread.Name = "HttpRequestThread"; httpThread.Priority = ThreadPriority.BelowNormal; httpThread.IsBackground = true; - finished = false; + _finished = false; httpThread.Start(); ThreadTracker.Add(httpThread); } @@ -322,37 +341,35 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest try { - request = (HttpWebRequest) - WebRequest.Create(url); - request.Method = httpMethod; - request.ContentType = httpMIMEType; - if (proxyurl.Length > 0) - { - if (proxyexcepts.Length > 0) { - string[] elist = proxyexcepts.Split(';'); - request.Proxy = new WebProxy(proxyurl,true,elist); - } else { - request.Proxy = new WebProxy(proxyurl,true); - } - } + Request = (HttpWebRequest) WebRequest.Create(Url); + Request.Method = HttpMethod; + Request.ContentType = HttpMIMEType; + if (proxyurl.Length > 0) + { + if (proxyexcepts.Length > 0) { + string[] elist = proxyexcepts.Split(';'); + Request.Proxy = new WebProxy(proxyurl,true,elist); + } else { + Request.Proxy = new WebProxy(proxyurl,true); + } + } - foreach (KeyValuePair entry in response_headers) - request.Headers[entry.Key] = entry.Value; + foreach (KeyValuePair entry in ResponseHeaders) + Request.Headers[entry.Key] = entry.Value; // Encode outbound data - if (outbound_body.Length > 0) { - byte[] data = Encoding.UTF8.GetBytes(outbound_body); + if (OutboundBody.Length > 0) { + byte[] data = Encoding.UTF8.GetBytes(OutboundBody); - request.ContentLength = data.Length; - Stream bstream = request.GetRequestStream(); + Request.ContentLength = data.Length; + Stream bstream = Request.GetRequestStream(); bstream.Write(data, 0, data.Length); bstream.Close(); } - request.Timeout = httpTimeout; + Request.Timeout = HttpTimeout; // execute the request - response = (HttpWebResponse) - request.GetResponse(); + response = (HttpWebResponse) Request.GetResponse(); Stream resStream = response.GetResponseStream(); @@ -372,23 +389,23 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest } } while (count > 0); // any more data to read? - response_body = sb.ToString(); + ResponseBody = sb.ToString(); } catch (Exception e) { if (e is WebException && ((WebException)e).Status == WebExceptionStatus.ProtocolError) { HttpWebResponse webRsp = (HttpWebResponse)((WebException)e).Response; - status = (int)webRsp.StatusCode; - response_body = webRsp.StatusDescription; + Status = (int)webRsp.StatusCode; + ResponseBody = webRsp.StatusDescription; } else { - status = (int)OSHttpStatusCode.ClientErrorJoker; - response_body = e.Message; + Status = (int)OSHttpStatusCode.ClientErrorJoker; + ResponseBody = e.Message; } - finished = true; + _finished = true; return; } finally @@ -397,8 +414,8 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest response.Close(); } - status = (int)OSHttpStatusCode.SuccessOk; - finished = true; + Status = (int)OSHttpStatusCode.SuccessOk; + _finished = true; } public void Stop() diff --git a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs index 3d0afd1cfe..af78c3624a 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs @@ -32,8 +32,8 @@ using System.Net; using OpenMetaverse; using OpenMetaverse.Imaging; using Nini.Config; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL { diff --git a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs index 3b318a4c73..60806a77c7 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs @@ -34,8 +34,8 @@ using System.Net; using OpenMetaverse; using OpenMetaverse.Imaging; using Nini.Config; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; //using Cairo; diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs index 99e3177478..258734d2de 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs @@ -31,8 +31,8 @@ using System.Collections.Generic; using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; // using log4net; // using System.Reflection; @@ -313,7 +313,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm /// Pop the first availlable listen event from the queue /// /// ListenerInfo with filter filled in - public ListenerInfo GetNextMessage() + public IWorldCommListenerInfo GetNextMessage() { ListenerInfo li = null; @@ -608,7 +608,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm } } - public class ListenerInfo + public class ListenerInfo: IWorldCommListenerInfo { private bool m_active; // Listener is active or not private int m_handle; // Assigned handle of this listener diff --git a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs index 28028bc736..fb86731652 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs @@ -37,8 +37,8 @@ using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; /***************************************************** * @@ -302,7 +302,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC } } - public RPCRequestInfo GetNextCompletedRequest() + public IXmlRpcRequestInfo GetNextCompletedRequest() { if (m_rpcPending != null) { @@ -345,10 +345,11 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC localID, itemID, channel, dest, idata, sdata ); m_pendingSRDResponses.Add(req.GetReqID(), req); - return req.process(); + req.Process(); + return req.ReqID; } - public SendRemoteDataRequest GetNextCompletedSRDRequest() + public IServiceRequest GetNextCompletedSRDRequest() { if (m_pendingSRDResponses != null) { @@ -360,7 +361,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC if (m_pendingSRDResponses.TryGetValue(luid, out tmpReq)) { - if (tmpReq.finished) + if (tmpReq.Finished) return tmpReq; } } @@ -389,7 +390,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC { foreach (SendRemoteDataRequest li in m_pendingSRDResponses.Values) { - if (li.m_itemID.Equals(itemID)) + if (li.ItemID.Equals(itemID)) m_pendingSRDResponses.Remove(li.GetReqID()); } } @@ -460,7 +461,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC } } - public class RPCRequestInfo + public class RPCRequestInfo: IXmlRpcRequestInfo { private UUID m_ChannelKey; private string m_IntVal; @@ -575,45 +576,64 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC } } - public class SendRemoteDataRequest + public class SendRemoteDataRequest: IServiceRequest { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public string channel; - public string destURL; - public bool finished; + + public string Channel; + public string DestURL; + private bool _finished; + public bool Finished + { + get { return _finished; } + set { _finished = value; } + } private Thread httpThread; - public int idata; - public UUID m_itemID; - public uint m_localID; - public UUID reqID; - public XmlRpcRequest request; - public int response_idata; - public string response_sdata; - public string sdata; + public int Idata; + private UUID _itemID; + public UUID ItemID + { + get { return _itemID; } + set { _itemID = value; } + } + private uint _localID; + public uint LocalID + { + get { return _localID; } + set { _localID = value; } + } + private UUID _reqID; + public UUID ReqID + { + get { return _reqID; } + set { _reqID = value; } + } + public XmlRpcRequest Request; + public int ResponseIdata; + public string ResponseSdata; + public string Sdata; public SendRemoteDataRequest(uint localID, UUID itemID, string channel, string dest, int idata, string sdata) { - this.channel = channel; - destURL = dest; - this.idata = idata; - this.sdata = sdata; - m_itemID = itemID; - m_localID = localID; + this.Channel = channel; + DestURL = dest; + this.Idata = idata; + this.Sdata = sdata; + ItemID = itemID; + LocalID = localID; - reqID = UUID.Random(); + ReqID = UUID.Random(); } - public UUID process() + public void Process() { httpThread = new Thread(SendRequest); httpThread.Name = "HttpRequestThread"; httpThread.Priority = ThreadPriority.BelowNormal; httpThread.IsBackground = true; - finished = false; + _finished = false; httpThread.Start(); ThreadTracker.Add(httpThread); - - return reqID; } /* @@ -629,21 +649,21 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC // if not, use as method name UUID parseUID; string mName = "llRemoteData"; - if ((channel != null) && (channel != "")) - if (!UUID.TryParse(channel, out parseUID)) - mName = channel; + if ((Channel != null) && (Channel != "")) + if (!UUID.TryParse(Channel, out parseUID)) + mName = Channel; else - param["Channel"] = channel; + param["Channel"] = Channel; - param["StringValue"] = sdata; - param["IntValue"] = Convert.ToString(idata); + param["StringValue"] = Sdata; + param["IntValue"] = Convert.ToString(Idata); ArrayList parameters = new ArrayList(); parameters.Add(param); XmlRpcRequest req = new XmlRpcRequest(mName, parameters); try { - XmlRpcResponse resp = req.Send(destURL, 30000); + XmlRpcResponse resp = req.Send(DestURL, 30000); if (resp != null) { Hashtable respParms; @@ -660,31 +680,31 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC { if (respParms.Contains("StringValue")) { - sdata = (string) respParms["StringValue"]; + Sdata = (string) respParms["StringValue"]; } if (respParms.Contains("IntValue")) { - idata = Convert.ToInt32((string) respParms["IntValue"]); + Idata = Convert.ToInt32((string) respParms["IntValue"]); } if (respParms.Contains("faultString")) { - sdata = (string) respParms["faultString"]; + Sdata = (string) respParms["faultString"]; } if (respParms.Contains("faultCode")) { - idata = Convert.ToInt32(respParms["faultCode"]); + Idata = Convert.ToInt32(respParms["faultCode"]); } } } } catch (Exception we) { - sdata = we.Message; + Sdata = we.Message; m_log.Warn("[SendRemoteDataRequest]: Request failed"); m_log.Warn(we.StackTrace); } - finished = true; + _finished = true; } public void Stop() @@ -700,7 +720,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC public UUID GetReqID() { - return reqID; + return ReqID; } } } diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index c860d01c09..b507c528a5 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs @@ -36,8 +36,8 @@ using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Terrain; namespace OpenSim.Region.Environment.Modules.World.Archiver diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs index 179b82a0e5..9a06bf78be 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs @@ -33,10 +33,10 @@ using System.Xml; using OpenMetaverse; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Serialiser; using OpenSim.Region.Environment.Modules.World.Terrain; -using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Modules.World.Archiver { diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs index a5f477000d..56604d6587 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs @@ -27,10 +27,10 @@ using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Serialiser; using OpenSim.Region.Environment.Modules.World.Terrain; -using OpenSim.Region.Environment.Scenes; using System; using System.Collections.Generic; using System.IO; diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs index 9d9f81e515..ed494fc411 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs @@ -33,9 +33,9 @@ using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Serialiser; -using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Modules.World.Archiver { diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs index 035651a404..7a6c810935 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs @@ -33,8 +33,8 @@ using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Archiver { diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs index d7acd5423c..e26525245e 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs @@ -32,11 +32,11 @@ using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Environment.Modules.World.Archiver; using OpenSim.Region.Environment.Modules.World.Serialiser; using OpenSim.Region.Environment.Modules.World.Terrain; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Tests.Common.Setup; namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index d906bbd96a..6b74c838ff 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs @@ -32,8 +32,8 @@ using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Estate { diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs index 2ba4e3470c..267178edf2 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs @@ -32,7 +32,7 @@ using log4net; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Estate diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs index 9de0181b96..76555d2755 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs @@ -29,8 +29,8 @@ using System; using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Land { diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs index 6f501028a1..58176e422a 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs @@ -32,8 +32,8 @@ using System.Reflection; using OpenMetaverse; using log4net; using Nini.Config; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework; using OpenSim.Framework.Servers; using OpenSim.Framework.Communications.Capabilities; diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 89256fabd2..b5f7225d8d 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs @@ -31,8 +31,8 @@ using System.Reflection; using OpenMetaverse; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Land { diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index f0d5de27a0..9165554958 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs @@ -31,7 +31,7 @@ using System.Net; using OpenMetaverse; using OpenMetaverse.Packets; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.NPC { diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs index 7227cf09c1..2e7b16c1ca 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs @@ -27,8 +27,8 @@ using OpenMetaverse; using Nini.Config; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.NPC { diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index f086396606..060a4f4246 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -33,10 +33,10 @@ using System.Collections.Generic; using System.Reflection; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.Framework; using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander; -using OpenSim.Region.Environment.Scenes; using OpenSim.Framework.Communications.Cache; namespace OpenSim.Region.Environment.Modules.World.Permissions diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs index 40568e7524..afad3cf96f 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Serialiser { diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs index 1fb78b689d..8b3f2ce153 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs @@ -30,7 +30,7 @@ using System.IO; using System.IO.Compression; using System.Text; using System.Xml; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Serialiser { diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs index bd852646cb..d0ce3d85fa 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs @@ -27,7 +27,7 @@ using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Serialiser { diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs index f939adfe95..0e7873cc46 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs @@ -30,9 +30,9 @@ using System.Collections.Generic; using System.IO; using OpenMetaverse; using Nini.Config; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander; -using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Modules.World.Serialiser { diff --git a/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs b/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs index 45474807ae..1713797bcd 100644 --- a/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs @@ -31,8 +31,8 @@ using Nini.Config; using log4net; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.World.Sound { diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs index 9d8956e5c2..ee96d58440 100644 --- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs @@ -30,8 +30,8 @@ using System.Collections.Generic; using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs index c5e99b5651..83246fb654 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs @@ -25,7 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs index 5bc6799ae5..20821374fb 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs @@ -25,7 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs index 48da96d29c..a8e79d076d 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs @@ -28,7 +28,7 @@ using System.Drawing; using System.Drawing.Imaging; using System.IO; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs index accffd2037..b76fe05927 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs @@ -28,7 +28,7 @@ using System.Drawing; using System.Drawing.Imaging; using System.IO; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs index 983ad29cfa..80873d9a6c 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs @@ -29,7 +29,8 @@ using System; using System.Drawing; using System.Drawing.Imaging; using System.IO; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs index 35576c71f4..bea504d3b6 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs @@ -29,7 +29,7 @@ using System; using System.Drawing; using System.Drawing.Imaging; using System.IO; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs index 5158525208..e323e2872a 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs @@ -27,7 +27,8 @@ using System; using System.IO; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs index 19e181ef6a..25967f3a6e 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs @@ -28,7 +28,7 @@ using System.Drawing; using System.Drawing.Imaging; using System.IO; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs index 758821a098..7aff56a2af 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs @@ -26,7 +26,8 @@ */ using System.IO; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs index 95b43b0a44..050348722f 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs @@ -28,7 +28,7 @@ using System.Drawing; using System.Drawing.Imaging; using System.IO; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs index 2bf029e0d7..44d03e35f7 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs @@ -28,7 +28,8 @@ using System; using System.IO; using System.Text; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs index f3c8a133dd..4d49a70b93 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs index 3646d6110c..64f9014f5e 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs index f7c4893e0c..2d44a3a179 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs @@ -26,7 +26,8 @@ */ using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs index 5eff3d69c3..0c7d01661d 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs index 602a5cce73..3f06d8270c 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs index 8fd805e3b0..3881264d09 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs index bbbe2a37ab..4533e9ec95 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs index 9fe93a222b..5bae84b85e 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs @@ -26,7 +26,7 @@ */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs index 950b27ba49..21bda58db4 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs @@ -26,7 +26,7 @@ */ using System.IO; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs index e2a9cde188..7461560788 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs index 3fa3f8ae3c..4d694cc167 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs @@ -26,7 +26,8 @@ */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs index c103d992ed..91c030d349 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs @@ -26,7 +26,8 @@ */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs index 745d3da89d..d391e94f0e 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs @@ -26,7 +26,7 @@ */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs index 23f7bc505d..32a6869c40 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs @@ -27,7 +27,8 @@ using System; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs index 42ec7945d3..86d01d37d8 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs @@ -26,7 +26,8 @@ */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs index 56813ab40a..a0ff2621b9 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs @@ -26,7 +26,8 @@ */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs index d3a1d3d8f0..af6d94d07a 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs @@ -26,7 +26,8 @@ */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs index 0b4996f853..fe270f70e7 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs @@ -25,7 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs index 1288419130..faba11960e 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs @@ -25,7 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs index 3c27872e40..bc601dc0fe 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs @@ -33,12 +33,12 @@ using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander; using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders; using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes; using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; -using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Modules.World.Terrain { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs index 3511988bdd..2acd5bc569 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs @@ -27,6 +27,7 @@ using System; using NUnit.Framework; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; namespace OpenSim.Region.Environment.Modules.World.Terrain.Tests diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs index f6b82a3eb3..8a49540a6f 100644 --- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs @@ -33,8 +33,8 @@ using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.TreePopulator { diff --git a/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs index a1c21929b8..4c4ca0d2cf 100644 --- a/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs @@ -33,8 +33,8 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.Avatar.Vegetation { diff --git a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs index 52f52eb2c8..8e54fd9ca8 100644 --- a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs @@ -30,8 +30,8 @@ using System.Collections.Generic; using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules { diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs index bebcc5256a..cb0ac8cca3 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs @@ -26,7 +26,7 @@ */ using System.Drawing; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using Nini.Config; namespace OpenSim.Region.Environment diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs index 1c4372419c..a806c7da13 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs @@ -35,8 +35,8 @@ using System.Reflection; using Nini.Config; using OpenMetaverse.Imaging; using log4net; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; namespace OpenSim.Region.Environment.Modules.World.WorldMap diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs index 654157149e..fcac7e14c4 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs @@ -29,9 +29,9 @@ using System.Reflection; using System.Collections.Generic; using System.Net; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Scenes.Hypergrid; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Scenes.Hypergrid; using OpenMetaverse; using log4net; using Nini.Config; diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs index dffa72a519..7fe538eb9d 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs @@ -36,8 +36,8 @@ using OpenMetaverse; using OpenMetaverse.Imaging; using Nini.Config; using log4net; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Environment.Modules.World.WorldMap { diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs index d66bbdb176..d23c35266a 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs @@ -37,8 +37,8 @@ using Nini.Config; using log4net; using OpenMetaverse.Imaging; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Terrain; namespace OpenSim.Region.Environment.Modules.World.WorldMap diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs index cf1900b5c8..37b454780e 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs @@ -43,9 +43,9 @@ using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Types; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Scenes.Types; using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using OSD = OpenMetaverse.StructuredData.OSD; diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs index fd37d76aee..db9ace1f1d 100644 --- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs @@ -27,7 +27,7 @@ using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Examples.SimpleModule { diff --git a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs index 4038564e8b..da909c38e2 100644 --- a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs @@ -29,7 +29,7 @@ using System; using System.Diagnostics; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Examples.SimpleModule { diff --git a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs index 2b84f1d387..fe3d14fa44 100644 --- a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs @@ -28,7 +28,7 @@ using System.IO; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Examples.SimpleModule { diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 3710f2c73a..aac599079f 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs @@ -31,7 +31,7 @@ using System.Net; using OpenMetaverse; using OpenMetaverse.Packets; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Examples.SimpleModule { diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs index 0d7919decb..6c9cf2cbb1 100644 --- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs +++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs @@ -30,8 +30,8 @@ using System.IO; using OpenMetaverse; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Examples.SimpleModule { diff --git a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs similarity index 94% rename from OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs rename to OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs index 43c733d0d7..49a5dd06e9 100644 --- a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs +++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs @@ -27,9 +27,10 @@ using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IAgentAssetTransactions { diff --git a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs similarity index 95% rename from OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs rename to OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs index a722833e16..b5332064c7 100644 --- a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs +++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs @@ -27,9 +27,9 @@ using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IAvatarFactory { diff --git a/OpenSim/Region/Environment/Interfaces/ICapabilitiesModule.cs b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs similarity index 98% rename from OpenSim/Region/Environment/Interfaces/ICapabilitiesModule.cs rename to OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs index 8a2c549884..bac0b2ec8d 100644 --- a/OpenSim/Region/Environment/Interfaces/ICapabilitiesModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs @@ -31,7 +31,7 @@ using OpenMetaverse; using OpenSim.Framework; using Caps = OpenSim.Framework.Communications.Capabilities.Caps; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface ICapabilitiesModule { diff --git a/OpenSim/Region/Environment/Interfaces/ICommand.cs b/OpenSim/Region/Framework/Interfaces/ICommand.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/ICommand.cs rename to OpenSim/Region/Framework/Interfaces/ICommand.cs index c1da2c3deb..1551b58ffe 100644 --- a/OpenSim/Region/Environment/Interfaces/ICommand.cs +++ b/OpenSim/Region/Framework/Interfaces/ICommand.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public enum CommandIntentions { diff --git a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs b/OpenSim/Region/Framework/Interfaces/ICommandableModule.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/ICommandableModule.cs rename to OpenSim/Region/Framework/Interfaces/ICommandableModule.cs index c4ed942118..5d6660d92f 100644 --- a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ICommandableModule.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface ICommandableModule { diff --git a/OpenSim/Region/Environment/Interfaces/ICommander.cs b/OpenSim/Region/Framework/Interfaces/ICommander.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/ICommander.cs rename to OpenSim/Region/Framework/Interfaces/ICommander.cs index a61ce490a6..17a2e4ac55 100644 --- a/OpenSim/Region/Environment/Interfaces/ICommander.cs +++ b/OpenSim/Region/Framework/Interfaces/ICommander.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface ICommander { diff --git a/OpenSim/Region/Environment/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs similarity index 99% rename from OpenSim/Region/Environment/Interfaces/IDialogModule.cs rename to OpenSim/Region/Framework/Interfaces/IDialogModule.cs index 755aa27502..7247d52cc4 100644 --- a/OpenSim/Region/Environment/Interfaces/IDialogModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs @@ -29,7 +29,7 @@ using System; using OpenMetaverse; using OpenSim.Framework; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IDialogModule { diff --git a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs similarity index 98% rename from OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs rename to OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs index c54c6977dd..e119bc3c40 100644 --- a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs +++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs @@ -28,7 +28,7 @@ using System.IO; using OpenMetaverse; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IDynamicTextureManager { diff --git a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/IEmailModule.cs rename to OpenSim/Region/Framework/Interfaces/IEmailModule.cs index 5f1bcf3dfa..b5f885a2ac 100644 --- a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs @@ -29,7 +29,7 @@ using System; using OpenSim.Framework; using OpenMetaverse; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public class Email { diff --git a/OpenSim/Region/Environment/Interfaces/IEntityCreator.cs b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs similarity index 96% rename from OpenSim/Region/Environment/Interfaces/IEntityCreator.cs rename to OpenSim/Region/Framework/Interfaces/IEntityCreator.cs index f45e95999c..1a6e626889 100644 --- a/OpenSim/Region/Environment/Interfaces/IEntityCreator.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs @@ -27,9 +27,9 @@ using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { /// /// Interface to a class that is capable of creating entities diff --git a/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/IEntityInventory.cs rename to OpenSim/Region/Framework/Interfaces/IEntityInventory.cs index a270293259..20fe09037f 100644 --- a/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs @@ -32,11 +32,10 @@ using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes.Scripting; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes.Scripting; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Interfaces { /// /// Interface to an entity's (SceneObjectPart's) inventory diff --git a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs rename to OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs index f2d14a6897..4da115e681 100644 --- a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs +++ b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs @@ -29,7 +29,7 @@ using System; using OpenSim.Framework; using OpenMetaverse; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IEstateDataStore { diff --git a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/IEstateModule.cs rename to OpenSim/Region/Framework/Interfaces/IEstateModule.cs index d84af2071f..f169f61dac 100644 --- a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs @@ -29,7 +29,7 @@ using System; using OpenSim.Framework; using OpenMetaverse; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IEstateModule : IRegionModule { diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs new file mode 100644 index 0000000000..cf609aef16 --- /dev/null +++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs @@ -0,0 +1,64 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.Net; +using OpenSim.Framework; +using OpenMetaverse; +using OpenMetaverse.Packets; +using OpenMetaverse.StructuredData; +using System.Collections.Generic; +using System.Text; + +namespace OpenSim.Region.Framework.Interfaces +{ + public interface IEventQueue + { + bool Enqueue(OSD o, UUID avatarID); + + // These are required to decouple Scenes from EventQueueHelper + void DisableSimulator(ulong handle, UUID avatarID); + void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID); + void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, + string capsPath); + void TeleportFinishEvent(ulong regionHandle, byte simAccess, + IPEndPoint regionExternalEndPoint, + uint locationID, uint flags, string capsURL, + UUID agentID); + void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, + IPEndPoint newRegionExternalEndPoint, + string capsURL, UUID avatarID, UUID sessionID); + void ChatterboxInvitation(UUID sessionID, string sessionName, + UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, + uint timeStamp, bool offline, int parentEstateID, Vector3 position, + uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket); + void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, + bool isModerator, bool textMute); + void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID); + void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID); + } +} diff --git a/OpenSim/Region/Environment/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs similarity index 98% rename from OpenSim/Region/Environment/Interfaces/IFriendsModule.cs rename to OpenSim/Region/Framework/Interfaces/IFriendsModule.cs index 5d3376c125..0bdfb8ffb6 100644 --- a/OpenSim/Region/Environment/Interfaces/IFriendsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs @@ -28,7 +28,7 @@ using OpenMetaverse; using OpenSim.Framework; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IFriendsModule { diff --git a/OpenSim/Region/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs similarity index 98% rename from OpenSim/Region/Interfaces/IGroupsModule.cs rename to OpenSim/Region/Framework/Interfaces/IGroupsModule.cs index c3f901a27f..16527d18c4 100644 --- a/OpenSim/Region/Interfaces/IGroupsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using OpenSim.Framework; using OpenMetaverse; -namespace OpenSim.Region.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public delegate void NewGroupNotice(UUID groupID, UUID noticeID); diff --git a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs similarity index 85% rename from OpenSim/Region/Environment/Interfaces/IHttpRequests.cs rename to OpenSim/Region/Framework/Interfaces/IHttpRequests.cs index 216782b9a9..fd49757e9e 100644 --- a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs +++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs @@ -25,18 +25,27 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; using System.Collections.Generic; +using System.Net; using OpenMetaverse; -using OpenSim.Region.Environment.Modules.Scripting.HttpRequest; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { - public interface IHttpRequests + public enum HttpRequestConstants + { + HTTP_METHOD = 0, + HTTP_MIMETYPE = 1, + HTTP_BODY_MAXLENGTH = 2, + HTTP_VERIFY_CERT = 3, + } + + public interface IHttpRequestModule { UUID MakeHttpRequest(string url, string parameters, string body); UUID StartHttpRequest(uint localID, UUID itemID, string url, List parameters, Dictionary headers, string body); void StopHttpRequest(uint m_localID, UUID m_itemID); - HttpRequestClass GetNextCompletedRequest(); + IServiceRequest GetNextCompletedRequest(); void RemoveCompletedRequest(UUID id); } } diff --git a/OpenSim/Region/Environment/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs similarity index 98% rename from OpenSim/Region/Environment/Interfaces/IInterregionComms.cs rename to OpenSim/Region/Framework/Interfaces/IInterregionComms.cs index 7aeef15046..783b3f94fd 100644 --- a/OpenSim/Region/Environment/Interfaces/IInterregionComms.cs +++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs @@ -29,7 +29,7 @@ using System; using OpenSim.Framework; using OpenMetaverse; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public delegate bool ChildAgentUpdateReceived(AgentData data); diff --git a/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs similarity index 95% rename from OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs rename to OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs index ee170b9aec..4314271b16 100644 --- a/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs @@ -27,10 +27,9 @@ using System.Collections.Generic; using OpenMetaverse; -using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Framework +namespace OpenSim.Region.Framework.Interfaces { /// /// An interface for a module that manages inter-agent inventory offers and transfers. diff --git a/OpenSim/Region/Environment/Interfaces/IJ2KDecoder.cs b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/IJ2KDecoder.cs rename to OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs index 2a37195ab5..1d10896ffd 100644 --- a/OpenSim/Region/Environment/Interfaces/IJ2KDecoder.cs +++ b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs @@ -28,7 +28,7 @@ using OpenMetaverse; using OpenMetaverse.Imaging; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public delegate void DecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers); diff --git a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs similarity index 96% rename from OpenSim/Region/Environment/Interfaces/ILandChannel.cs rename to OpenSim/Region/Framework/Interfaces/ILandChannel.cs index a8a58ef19f..35c2fc10e3 100644 --- a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs +++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs @@ -28,9 +28,9 @@ using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface ILandChannel { diff --git a/OpenSim/Region/Environment/Interfaces/ILandObject.cs b/OpenSim/Region/Framework/Interfaces/ILandObject.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/ILandObject.cs rename to OpenSim/Region/Framework/Interfaces/ILandObject.cs index 6fcf74b0db..52cc6cf4d4 100644 --- a/OpenSim/Region/Environment/Interfaces/ILandObject.cs +++ b/OpenSim/Region/Framework/Interfaces/ILandObject.cs @@ -28,9 +28,9 @@ using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public delegate int overrideParcelMaxPrimCountDelegate(ILandObject obj); public delegate int overrideSimulatorMaxPrimCountDelegate(ILandObject obj); diff --git a/OpenSim/Region/Interfaces/IMessageTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs similarity index 97% rename from OpenSim/Region/Interfaces/IMessageTransferModule.cs rename to OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs index ecaeceb414..f0a54736b3 100644 --- a/OpenSim/Region/Interfaces/IMessageTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs @@ -29,7 +29,7 @@ using System; using OpenSim.Framework; using OpenMetaverse; -namespace OpenSim.Region.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public delegate void MessageResultNotification(bool success); diff --git a/OpenSim/Region/Interfaces/IPresenceModule.cs b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs similarity index 98% rename from OpenSim/Region/Interfaces/IPresenceModule.cs rename to OpenSim/Region/Framework/Interfaces/IPresenceModule.cs index 23cf064cfc..011f8bb72a 100644 --- a/OpenSim/Region/Interfaces/IPresenceModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs @@ -29,7 +29,7 @@ using System; using OpenSim.Framework; using OpenMetaverse; -namespace OpenSim.Region.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public struct PresenceInfo { diff --git a/OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs similarity index 98% rename from OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs rename to OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs index 559d2a638b..97afe8d6c4 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs @@ -27,7 +27,7 @@ using System.IO; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { /// /// Interface to region archive functionality diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs rename to OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs index 78fc62662c..46d81ce080 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs @@ -28,9 +28,9 @@ using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IRegionDataStore { diff --git a/OpenSim/Region/Environment/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs similarity index 95% rename from OpenSim/Region/Environment/Interfaces/IRegionModule.cs rename to OpenSim/Region/Framework/Interfaces/IRegionModule.cs index ffa4f32cd7..6a450175fb 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs @@ -26,9 +26,9 @@ */ using Nini.Config; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IRegionModule { diff --git a/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs similarity index 98% rename from OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs rename to OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs index b89f8692d0..40e4c991b3 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs @@ -28,9 +28,9 @@ using OpenMetaverse; using System.Collections.Generic; using System.IO; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IRegionSerialiserModule { diff --git a/OpenSim/Region/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs similarity index 97% rename from OpenSim/Region/Interfaces/IScriptModule.cs rename to OpenSim/Region/Framework/Interfaces/IScriptModule.cs index 9dca862388..65620d3d57 100644 --- a/OpenSim/Region/Interfaces/IScriptModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs @@ -29,7 +29,7 @@ using System; using OpenSim.Framework; using OpenMetaverse; -namespace OpenSim.Region.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IScriptModule { diff --git a/OpenSim/Region/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IServiceRequest.cs similarity index 83% rename from OpenSim/Region/Interfaces/IEventQueue.cs rename to OpenSim/Region/Framework/Interfaces/IServiceRequest.cs index 5c327d97da..f3283c4015 100644 --- a/OpenSim/Region/Interfaces/IEventQueue.cs +++ b/OpenSim/Region/Framework/Interfaces/IServiceRequest.cs @@ -24,18 +24,22 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -using System; -using OpenSim.Framework; using OpenMetaverse; -using OpenMetaverse.StructuredData; -using System.Collections.Generic; -using System.Text; -namespace OpenSim.Region.Interfaces +namespace OpenSim.Region.Framework.Interfaces { - public interface IEventQueue + public interface IServiceRequest { - bool Enqueue(OSD o, UUID avatarID); + // Status + bool Finished { get; } + + // Request info + UUID ItemID { get; set; } + uint LocalID { get; set; } + UUID ReqID { get; set; } + + void Process(); + void SendRequest(); + void Stop(); } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Environment/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/ISoundModule.cs rename to OpenSim/Region/Framework/Interfaces/ISoundModule.cs index 3bb4c57f31..91c80e3fea 100644 --- a/OpenSim/Region/Environment/Interfaces/ISoundModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs @@ -29,7 +29,7 @@ using System; using Nini.Config; using OpenMetaverse; -namespace OpenSim.Region.Environment +namespace OpenSim.Region.Framework.Interfaces { public interface ISoundModule { diff --git a/OpenSim/Region/Environment/Interfaces/ITerrain.cs b/OpenSim/Region/Framework/Interfaces/ITerrain.cs similarity index 98% rename from OpenSim/Region/Environment/Interfaces/ITerrain.cs rename to OpenSim/Region/Framework/Interfaces/ITerrain.cs index d5e1540987..6e9c98d9e7 100644 --- a/OpenSim/Region/Environment/Interfaces/ITerrain.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrain.cs @@ -27,7 +27,7 @@ using OpenSim.Framework; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface ITerrain { diff --git a/OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs rename to OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs index 4bcb14b2fe..fc4ced264d 100644 --- a/OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface ITerrainChannel { diff --git a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs b/OpenSim/Region/Framework/Interfaces/ITextureSender.cs similarity index 98% rename from OpenSim/Region/Environment/Interfaces/ITextureSender.cs rename to OpenSim/Region/Framework/Interfaces/ITextureSender.cs index ece1953f52..aab3d263a2 100644 --- a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs +++ b/OpenSim/Region/Framework/Interfaces/ITextureSender.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { /// /// Interface for an object which can send texture information to a client diff --git a/OpenSim/Region/Environment/Interfaces/IVegetationModule.cs b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs similarity index 96% rename from OpenSim/Region/Environment/Interfaces/IVegetationModule.cs rename to OpenSim/Region/Framework/Interfaces/IVegetationModule.cs index c411993853..537a8dcaea 100644 --- a/OpenSim/Region/Environment/Interfaces/IVegetationModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs @@ -26,9 +26,9 @@ */ using OpenMetaverse; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IVegetationModule : IEntityCreator { diff --git a/OpenSim/Region/Environment/Interfaces/IWindModule.cs b/OpenSim/Region/Framework/Interfaces/IWindModule.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/IWindModule.cs rename to OpenSim/Region/Framework/Interfaces/IWindModule.cs index 9896c56f6d..96b303fc27 100644 --- a/OpenSim/Region/Environment/Interfaces/IWindModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IWindModule.cs @@ -29,7 +29,7 @@ using System; using OpenSim.Framework; using OpenMetaverse; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IWindModule : IRegionModule { diff --git a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs similarity index 79% rename from OpenSim/Region/Environment/Interfaces/IWorldComm.cs rename to OpenSim/Region/Framework/Interfaces/IWorldComm.cs index 1a33450d73..24865dbcf9 100644 --- a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs @@ -28,21 +28,37 @@ using System; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Modules.Scripting.WorldComm; +// using OpenSim.Region.Environment.Modules.Scripting.WorldComm; -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { + public interface IWorldCommListenerInfo + { + Object[] GetSerializationData(); + UUID GetItemID(); + UUID GetHostID(); + int GetChannel(); + uint GetLocalID(); + int GetHandle(); + string GetMessage(); + string GetName(); + bool IsActive(); + void Deactivate(); + void Activate(); + UUID GetID(); + } + public interface IWorldComm { int Listen(uint LocalID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg); void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg); bool HasMessages(); - ListenerInfo GetNextMessage(); + IWorldCommListenerInfo GetNextMessage(); void ListenControl(UUID itemID, int handle, int active); void ListenRemove(UUID itemID, int handle); void DeleteListener(UUID itemID); Object[] GetSerializationData(UUID itemID); void CreateFromData(uint localID, UUID itemID, UUID hostID, - Object[] data); + Object[] data); } } diff --git a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs similarity index 77% rename from OpenSim/Region/Environment/Interfaces/IXMLRPC.cs rename to OpenSim/Region/Framework/Interfaces/IXMLRPC.cs index 88e9ab5cc5..6570b0a477 100644 --- a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs +++ b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs @@ -26,10 +26,28 @@ */ using OpenMetaverse; -using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; +using Nwc.XmlRpc; -namespace OpenSim.Region.Environment.Interfaces +// using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; + +namespace OpenSim.Region.Framework.Interfaces { + public interface IXmlRpcRequestInfo + { + bool IsProcessed(); + UUID GetChannelKey(); + void SetProcessed(bool processed); + void SetStrRetval(string resp); + string GetStrRetval(); + void SetIntRetval(int resp); + int GetIntRetval(); + uint GetLocalID(); + UUID GetItemID(); + string GetStrVal(); + int GetIntValue(); + UUID GetMessageID(); + } + public interface IXMLRPC { UUID OpenXMLRPCChannel(uint localID, UUID itemID, UUID channelID); @@ -37,11 +55,11 @@ namespace OpenSim.Region.Environment.Interfaces bool hasRequests(); void RemoteDataReply(string channel, string message_id, string sdata, int idata); bool IsEnabled(); - RPCRequestInfo GetNextCompletedRequest(); + IXmlRpcRequestInfo GetNextCompletedRequest(); void RemoveCompletedRequest(UUID id); void DeleteChannels(UUID itemID); UUID SendRemoteData(uint localID, UUID itemID, string channel, string dest, int idata, string sdata); - SendRemoteDataRequest GetNextCompletedSRDRequest(); + IServiceRequest GetNextCompletedSRDRequest(); void RemoveCompletedSRDRequest(UUID id); void CancelSRDRequests(UUID itemID); } diff --git a/OpenSim/Region/Environment/Interfaces/IXfer.cs b/OpenSim/Region/Framework/Interfaces/IXfer.cs similarity index 97% rename from OpenSim/Region/Environment/Interfaces/IXfer.cs rename to OpenSim/Region/Framework/Interfaces/IXfer.cs index bad1833ead..a83f166553 100644 --- a/OpenSim/Region/Environment/Interfaces/IXfer.cs +++ b/OpenSim/Region/Framework/Interfaces/IXfer.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Region.Environment.Interfaces +namespace OpenSim.Region.Framework.Interfaces { public interface IXfer { diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Framework/ModuleLoader.cs similarity index 70% rename from OpenSim/Region/Environment/ModuleLoader.cs rename to OpenSim/Region/Framework/ModuleLoader.cs index f06fa0f80b..d393919baa 100644 --- a/OpenSim/Region/Environment/ModuleLoader.cs +++ b/OpenSim/Region/Framework/ModuleLoader.cs @@ -31,18 +31,10 @@ using System.IO; using System.Reflection; using log4net; using Nini.Config; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; -using OpenSim.Region.Environment.Modules.Avatar.Chat; -using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; -using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture; -using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; -using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; -//TODO: Why do we reference InstantMessageModule here? - -namespace OpenSim.Region.Environment +namespace OpenSim.Region.Framework { public class ModuleLoader { @@ -81,83 +73,19 @@ namespace OpenSim.Region.Environment return modules; } - public void LoadDefaultSharedModules() + public void LoadDefaultSharedModule(IRegionModule module) { - DynamicTextureModule dynamicModule = new DynamicTextureModule(); - if (m_loadedSharedModules.ContainsKey(dynamicModule.Name)) + if (m_loadedSharedModules.ContainsKey(module.Name)) { - m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule"); + m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module not added!", module.Name); } else { - m_loadedSharedModules.Add(dynamicModule.Name, dynamicModule); + m_loadedSharedModules.Add(module.Name, module); } - - // ChatModule chat = new ChatModule(); - // if (m_loadedSharedModules.ContainsKey(chat.Name)) - // { - // m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule"); - // } - // else - // { - // m_loadedSharedModules.Add(chat.Name, chat); - // } - - InstantMessageModule imMod = new InstantMessageModule(); - if (m_loadedSharedModules.ContainsKey(imMod.Name)) - { - m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule"); - } - else - { - m_loadedSharedModules.Add(imMod.Name, imMod); - } - - LoadImageURLModule loadMod = new LoadImageURLModule(); - if (m_loadedSharedModules.ContainsKey(loadMod.Name)) - { - m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule"); - } - else - { - m_loadedSharedModules.Add(loadMod.Name, loadMod); - } - - // AvatarFactoryModule avatarFactory = new AvatarFactoryModule(); - // if (m_loadedSharedModules.ContainsKey(avatarFactory.Name)) - // { - // m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule"); - // } - // else - // { - // m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory); - // } - - XMLRPCModule xmlRpcMod = new XMLRPCModule(); - if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name)) - { - m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule"); - } - else - { - m_loadedSharedModules.Add(xmlRpcMod.Name, xmlRpcMod); - } - //TextureDownloadModule textureModule = new TextureDownloadModule(); - - //LoadedSharedModules.Add(textureModule.Name, textureModule); - - AssetTransactionModule transactionsModule = new AssetTransactionModule(); - if (m_loadedSharedModules.ContainsKey(transactionsModule.Name)) - { - m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule"); - } - else - { - m_loadedSharedModules.Add(transactionsModule.Name, transactionsModule); - } - } + public void InitialiseSharedModules(Scene scene) { foreach (IRegionModule module in m_loadedSharedModules.Values) diff --git a/OpenSim/Region/Environment/Scenes/Animation.cs b/OpenSim/Region/Framework/Scenes/Animation.cs similarity index 98% rename from OpenSim/Region/Environment/Scenes/Animation.cs rename to OpenSim/Region/Framework/Scenes/Animation.cs index 2854e06f26..3504717b83 100644 --- a/OpenSim/Region/Environment/Scenes/Animation.cs +++ b/OpenSim/Region/Framework/Scenes/Animation.cs @@ -28,7 +28,7 @@ using System; using OpenMetaverse; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public class Animation { diff --git a/OpenSim/Region/Environment/Scenes/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/AnimationSet.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/AnimationSet.cs rename to OpenSim/Region/Framework/Scenes/AnimationSet.cs index df2517339d..f53bb78253 100644 --- a/OpenSim/Region/Environment/Scenes/AnimationSet.cs +++ b/OpenSim/Region/Framework/Scenes/AnimationSet.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using OpenMetaverse; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public class AnimationSet { diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs rename to OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs index 142945221a..178f1f7aeb 100644 --- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs @@ -34,7 +34,7 @@ using OpenMetaverse; using OpenMetaverse.Packets; using OpenSim.Framework; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { class DeleteToInventoryHolder { diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs similarity index 98% rename from OpenSim/Region/Environment/Scenes/AvatarAnimations.cs rename to OpenSim/Region/Framework/Scenes/AvatarAnimations.cs index d4dd0db3b9..562fcf99a9 100644 --- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs +++ b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs @@ -29,7 +29,7 @@ using System.Collections.Generic; using System.Xml; using OpenMetaverse; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public class AvatarAnimations { diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/EntityBase.cs rename to OpenSim/Region/Framework/Scenes/EntityBase.cs index 3ae8cde84c..5055e44af9 100644 --- a/OpenSim/Region/Environment/Scenes/EntityBase.cs +++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs @@ -30,7 +30,7 @@ using System.Runtime.Serialization; using System.Security.Permissions; using OpenMetaverse; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { [Serializable] public abstract class EntityBase : ISerializable diff --git a/OpenSim/Region/Environment/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/EntityManager.cs rename to OpenSim/Region/Framework/Scenes/EntityManager.cs index f89d3616c7..a32276607e 100644 --- a/OpenSim/Region/Environment/Scenes/EntityManager.cs +++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs @@ -33,7 +33,7 @@ using log4net; using OpenMetaverse; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public class EntityManager : IEnumerable { diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/EventManager.cs rename to OpenSim/Region/Framework/Scenes/EventManager.cs index bba7eeddb5..23e12788c6 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs @@ -29,11 +29,12 @@ using System; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Client; -using OpenSim.Region.Environment.Interfaces; -using Caps=OpenSim.Framework.Communications.Capabilities.Caps; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; +using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using System.Collections.Generic; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { /// /// A class for triggering remote scene events. diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs rename to OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs index 73a5a3a09a..bd9c2601d2 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs @@ -40,13 +40,13 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; +// using OpenSim.Region.Environment; +using OpenSim.Region.Framework.Scenes; //using HyperGrid.Framework; //using OpenSim.Region.Communications.Hypergrid; -namespace OpenSim.Region.Environment.Scenes.Hypergrid +namespace OpenSim.Region.Framework.Scenes.Hypergrid { public class HGAssetMapper { diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs similarity index 97% rename from OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs rename to OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs index bdb90d8912..f36075e219 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs @@ -40,10 +40,10 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; +// using OpenSim.Region.Environment; +using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Scenes.Hypergrid +namespace OpenSim.Region.Framework.Scenes.Hypergrid { public partial class HGScene : Scene { diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs similarity index 96% rename from OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs rename to OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs index ca644a6403..a52fdc6dbe 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs @@ -34,11 +34,11 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; +// using OpenSim.Region.Environment; +using OpenSim.Region.Framework.Scenes; using TPFlags = OpenSim.Framework.Constants.TeleportFlags; -namespace OpenSim.Region.Environment.Scenes.Hypergrid +namespace OpenSim.Region.Framework.Scenes.Hypergrid { public partial class HGScene : Scene { diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs similarity index 95% rename from OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs rename to OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs index 5e3e03fe56..d0dc4f7310 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs @@ -38,11 +38,11 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Capabilities; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment; -using OpenSim.Region.Interfaces; +using OpenSim.Region.Framework.Scenes; +// using OpenSim.Region.Environment; +using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Scenes.Hypergrid +namespace OpenSim.Region.Framework.Scenes.Hypergrid { public class HGSceneCommunicationService : SceneCommunicationService { @@ -208,16 +208,14 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid if (eq != null) { - OSD Item = EventQueueHelper.EnableSimulator(realHandle, endPoint); - eq.Enqueue(Item, avatar.UUID); + eq.EnableSimulator(realHandle, endPoint, avatar.UUID); // ES makes the client send a UseCircuitCode message to the destination, // which triggers a bunch of things there. // So let's wait Thread.Sleep(2000); - Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath); - eq.Enqueue(Item, avatar.UUID); + eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath); } else { @@ -267,9 +265,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid /// if (eq != null) { - OSD Item = EventQueueHelper.TeleportFinishEvent(realHandle, 13, endPoint, - 4, teleportFlags, capsPath, avatar.UUID); - eq.Enqueue(Item, avatar.UUID); + eq.TeleportFinishEvent(realHandle, 13, endPoint, + 4, teleportFlags, capsPath, avatar.UUID); } else { diff --git a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Framework/Scenes/IScenePresenceBody.cs similarity index 97% rename from OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs rename to OpenSim/Region/Framework/Scenes/IScenePresenceBody.cs index 9a4c72f9e1..bd5ad33caa 100644 --- a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs +++ b/OpenSim/Region/Framework/Scenes/IScenePresenceBody.cs @@ -28,7 +28,7 @@ using OpenMetaverse; using OpenSim.Framework; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public interface IScenePresenceBody { diff --git a/OpenSim/Region/Environment/Scenes/ReturnInfo.cs b/OpenSim/Region/Framework/Scenes/ReturnInfo.cs similarity index 97% rename from OpenSim/Region/Environment/Scenes/ReturnInfo.cs rename to OpenSim/Region/Framework/Scenes/ReturnInfo.cs index 898baab083..43d07f5554 100644 --- a/OpenSim/Region/Environment/Scenes/ReturnInfo.cs +++ b/OpenSim/Region/Framework/Scenes/ReturnInfo.cs @@ -27,7 +27,7 @@ using OpenMetaverse; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public struct ReturnInfo { diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/Scene.Inventory.cs rename to OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index bc80d56801..e366c791fb 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -34,10 +34,10 @@ using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework; +using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public partial class Scene { diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs rename to OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 3334e819f7..039b81b748 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs @@ -33,7 +33,7 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public partial class Scene { diff --git a/OpenSim/Region/Environment/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/Scene.Permissions.cs rename to OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index 08721284c7..6aa617f80c 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Permissions.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs @@ -30,9 +30,9 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public class ScenePermissions { diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/Scene.cs rename to OpenSim/Region/Framework/Scenes/Scene.cs index f798a0e31e..f07391dfc7 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -40,10 +40,8 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Modules.World.Terrain; -using OpenSim.Region.Environment.Scenes.Scripting; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes.Scripting; using OpenSim.Region.Physics.Manager; using Nini.Config; using Caps = OpenSim.Framework.Communications.Capabilities.Caps; @@ -52,7 +50,7 @@ using TPFlags = OpenSim.Framework.Constants.TeleportFlags; using Timer = System.Timers.Timer; using OSD = OpenMetaverse.StructuredData.OSD; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public delegate bool FilterAvatarList(ScenePresence avatar); @@ -123,7 +121,12 @@ namespace OpenSim.Region.Environment.Scenes protected IInterregionCommsOut m_interregionCommsOut; protected IInterregionCommsIn m_interregionCommsIn; protected IDialogModule m_dialogModule; - protected internal ICapabilitiesModule CapsModule; + + protected ICapabilitiesModule m_capsModule; + public ICapabilitiesModule CapsModule + { + get { return m_capsModule; } + } // Central Update Loop @@ -747,7 +750,7 @@ namespace OpenSim.Region.Environment.Scenes m_interregionCommsOut = RequestModuleInterface(); m_interregionCommsIn = RequestModuleInterface(); m_dialogModule = RequestModuleInterface(); - CapsModule = RequestModuleInterface(); + m_capsModule = RequestModuleInterface(); } #endregion @@ -972,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes /// Perform delegate action on all clients subscribing to updates from this region. /// /// - internal void Broadcast(Action whatToDo) + public void Broadcast(Action whatToDo) { ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); }); } @@ -2965,8 +2968,7 @@ namespace OpenSim.Region.Environment.Scenes IEventQueue eq = RequestModuleInterface(); if (eq != null) { - OSD Item = EventQueueHelper.DisableSimulator(RegionInfo.RegionHandle); - eq.Enqueue(Item, agentID); + eq.DisableSimulator(RegionInfo.RegionHandle, agentID); } else presence.ControllingClient.SendShutdownConnectionNotice(); @@ -3792,12 +3794,12 @@ namespace OpenSim.Region.Environment.Scenes return m_sceneGraph.GetSceneObjectPart(fullID); } - internal bool TryGetAvatar(UUID avatarId, out ScenePresence avatar) + public bool TryGetAvatar(UUID avatarId, out ScenePresence avatar) { return m_sceneGraph.TryGetAvatar(avatarId, out avatar); } - internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar) + public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar) { return m_sceneGraph.TryGetAvatarByName(avatarName, out avatar); } diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/SceneBase.cs rename to OpenSim/Region/Framework/Scenes/SceneBase.cs index 5b786177b7..6d61e9fe6a 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs @@ -33,9 +33,9 @@ using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public abstract class SceneBase : IScene { diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs similarity index 97% rename from OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs rename to OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 9935512fc3..a2b253791e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs @@ -33,14 +33,13 @@ using System.Threading; using OpenMetaverse; using OpenMetaverse.StructuredData; using log4net; -using OpenSim.Region.Environment.Interfaces; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Capabilities; -using OpenSim.Region.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OSD = OpenMetaverse.StructuredData.OSD; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public delegate void KiPrimitiveDelegate(uint localID); @@ -305,13 +304,10 @@ namespace OpenSim.Region.Environment.Scenes IEventQueue eq = avatar.Scene.RequestModuleInterface(); if (eq != null) { - OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, endPoint); - eq.Enqueue(Item, avatar.UUID); - - Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath); - eq.Enqueue(Item, avatar.UUID); - - m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}", capsPath, avatar.UUID, avatar.Scene.RegionInfo.RegionName); + eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID); + eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath); + m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}", + capsPath, avatar.UUID, avatar.Scene.RegionInfo.RegionName); } else { @@ -806,16 +802,14 @@ namespace OpenSim.Region.Environment.Scenes if (eq != null) { - OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, endPoint); - eq.Enqueue(Item, avatar.UUID); + eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID); // ES makes the client send a UseCircuitCode message to the destination, // which triggers a bunch of things there. // So let's wait Thread.Sleep(2000); - Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath); - eq.Enqueue(Item, avatar.UUID); + eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath); } else { @@ -860,9 +854,8 @@ namespace OpenSim.Region.Environment.Scenes if (eq != null) { - OSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, endPoint, - 4, teleportFlags, capsPath, avatar.UUID); - eq.Enqueue(Item, avatar.UUID); + eq.TeleportFinishEvent(reg.RegionHandle, 13, endPoint, + 4, teleportFlags, capsPath, avatar.UUID); } else { diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/SceneGraph.cs rename to OpenSim/Region/Framework/Scenes/SceneGraph.cs index 24eaad18f7..2877dcd134 100644 --- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -32,10 +32,10 @@ using OpenMetaverse; using OpenMetaverse.Packets; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Types; +using OpenSim.Region.Framework.Scenes.Types; using OpenSim.Region.Physics.Manager; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public delegate void PhysicsCrash(); @@ -312,7 +312,7 @@ namespace OpenSim.Region.Environment.Scenes /// Delete an object from the scene /// /// true if the object was deleted, false if there was no object to delete - protected internal bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked) + public bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked) { if (Entities.ContainsKey(uuid)) { @@ -797,8 +797,11 @@ namespace OpenSim.Region.Environment.Scenes /// suitable solution). /// /// - /// null if either the avatar wasn't in the scene, or they do not have a controlling client - protected internal IClientAPI GetControllingClient(UUID agentId) + /// null if either the avatar wasn't in the scene, or + /// they do not have a controlling client + /// this used to be protected internal, but that + /// prevents CapabilitiesModule from accessing it + public IClientAPI GetControllingClient(UUID agentId) { ScenePresence presence = GetScenePresence(agentId); @@ -1034,7 +1037,7 @@ namespace OpenSim.Region.Environment.Scenes return Entities.GetEntities(); } - protected internal Dictionary GetTopScripts() + public Dictionary GetTopScripts() { Dictionary topScripts = new Dictionary(); diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/SceneManager.cs rename to OpenSim/Region/Framework/Scenes/SceneManager.cs index b28eef26bb..180f8a19ee 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs @@ -32,9 +32,9 @@ using System.Reflection; using OpenMetaverse; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public delegate void RestartSim(RegionInfo thisregion); diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs rename to OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index 053e0daeb9..5fa6609208 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs @@ -31,11 +31,11 @@ using System.Reflection; using OpenMetaverse; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using System.Collections.Generic; using System.Xml; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public partial class SceneObjectGroup : EntityBase { diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs rename to OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 5ae95eecdd..57d9ce40a8 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -34,10 +34,10 @@ using System.Xml.Serialization; using OpenMetaverse; using OpenMetaverse.Packets; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Physics.Manager; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { [Flags] public enum scriptEvents diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/SceneObjectPart.cs rename to OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 256d6f8403..dfa9318727 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -37,11 +37,11 @@ using log4net; using OpenMetaverse; using OpenMetaverse.Packets; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes.Scripting; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes.Scripting; using OpenSim.Region.Physics.Manager; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { #region Enumerations diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs rename to OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 8137a5359d..efd486dde5 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs @@ -32,11 +32,10 @@ using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes.Scripting; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes.Scripting; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public class SceneObjectPartInventory : IEntityInventory { diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/ScenePresence.cs rename to OpenSim/Region/Framework/Scenes/ScenePresence.cs index ed455f42eb..36cd8626cc 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -36,13 +36,12 @@ using log4net; using OpenSim.Framework; using OpenSim.Framework.Client; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Types; -using OpenSim.Region.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes.Types; using OpenSim.Region.Physics.Manager; using OSD = OpenMetaverse.StructuredData.OSD; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { enum ScriptControlled : uint { @@ -2474,10 +2473,9 @@ namespace OpenSim.Region.Environment.Scenes IEventQueue eq = m_scene.RequestModuleInterface(); if (eq != null) - { - OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, - capsPath, UUID, ControllingClient.SessionId); - eq.Enqueue(Item, UUID); + { + eq.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, + capsPath, UUID, ControllingClient.SessionId); } else { diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs similarity index 99% rename from OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs rename to OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs index 2e9c551b38..7d9d247df3 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs @@ -35,7 +35,7 @@ using log4net; using OpenSim.Framework; using OpenSim.Region.Physics.Manager; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { /// /// Static methods to serialize and deserialize scene objects to and from XML diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs similarity index 97% rename from OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs rename to OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs index 152825fa46..440820bd55 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs +++ b/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs @@ -27,7 +27,7 @@ using OpenMetaverse; -namespace OpenSim.Region.Environment.Scenes.Scripting +namespace OpenSim.Region.Framework.Scenes.Scripting { public interface IScriptHost { diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs similarity index 98% rename from OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs rename to OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs index 37f5d43ad9..fd7ff964d7 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs +++ b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs @@ -28,7 +28,7 @@ using System; using OpenMetaverse; -namespace OpenSim.Region.Environment.Scenes.Scripting +namespace OpenSim.Region.Framework.Scenes.Scripting { public class NullScriptHost : IScriptHost { diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineInterface.cs similarity index 97% rename from OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs rename to OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineInterface.cs index b1ee519f4b..d358187754 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs +++ b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineInterface.cs @@ -27,7 +27,7 @@ //TODO: WHERE TO PLACE THIS? -namespace OpenSim.Region.Environment.Scenes.Scripting +namespace OpenSim.Region.Framework.Scenes.Scripting { public interface ScriptEngineInterface { diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs similarity index 98% rename from OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs rename to OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs index 6216e2c041..58228cc9fa 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs @@ -31,7 +31,7 @@ using System.IO; using System.Reflection; using log4net; -namespace OpenSim.Region.Environment.Scenes.Scripting +namespace OpenSim.Region.Framework.Scenes.Scripting { public class ScriptEngineLoader { diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs similarity index 99% rename from OpenSim/Region/Environment/Scenes/SimStatsReporter.cs rename to OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index efda1405d0..b2cea5dc0e 100644 --- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs @@ -31,9 +31,9 @@ using System.Timers; using OpenMetaverse.Packets; using OpenSim.Framework; using OpenSim.Framework.Statistics; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public class SimStatsReporter { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs similarity index 98% rename from OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs rename to OpenSim/Region/Framework/Scenes/TerrainChannel.cs index 1534c4bf25..55c5181f9c 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs +++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs @@ -26,14 +26,14 @@ */ using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using System; using System.Text; using System.Xml; using System.IO; using System.Xml.Serialization; -namespace OpenSim.Region.Environment.Modules.World.Terrain +namespace OpenSim.Region.Framework.Scenes { /// /// A new version of the old Channel class, simplified diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs b/OpenSim/Region/Framework/Scenes/TerrainUtil.cs similarity index 98% rename from OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs rename to OpenSim/Region/Framework/Scenes/TerrainUtil.cs index b20ff42ced..318a682dbd 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs +++ b/OpenSim/Region/Framework/Scenes/TerrainUtil.cs @@ -26,9 +26,9 @@ */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Modules.World.Terrain +namespace OpenSim.Region.Framework.Scenes { public static class TerrainUtil { diff --git a/OpenSim/Region/Environment/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs similarity index 98% rename from OpenSim/Region/Environment/Scenes/Tests/EntityManagerTests.cs rename to OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs index 01559665a1..2c6ccc8a7f 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/EntityManagerTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs @@ -35,10 +35,10 @@ using NUnit.Framework.SyntaxHelpers; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Tests.Common.Setup; -namespace OpenSim.Region.Environment.Scenes.Tests +namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture] public class EntityManagerTests diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/Tests/SceneObjectBasicTests.cs rename to OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/Tests/SceneObjectLinkingTests.cs rename to OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs diff --git a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs similarity index 98% rename from OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs rename to OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index d66c365729..dc8df3255c 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs @@ -34,14 +34,14 @@ using NUnit.Framework.SyntaxHelpers; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Environment.Modules.Communications.Local; using OpenSim.Region.Environment.Modules.World.Serialiser; using OpenSim.Tests.Common.Mock; using OpenSim.Tests.Common.Setup; -namespace OpenSim.Region.Environment.Scenes.Tests +namespace OpenSim.Region.Framework.Scenes.Tests { /// /// Scene presence tests diff --git a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs similarity index 98% rename from OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs rename to OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs index 221d97fdaa..a78faa6f5b 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs @@ -32,12 +32,12 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Environment.Modules.Communications.REST; using OpenSim.Tests.Common.Mock; using OpenSim.Tests.Common.Setup; -namespace OpenSim.Region.Environment.Scenes.Tests +namespace OpenSim.Region.Framework.Scenes.Tests { /// /// Teleport tests in a standalone OpenSim diff --git a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs similarity index 99% rename from OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs rename to OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs index 24ce94b106..9fbbb1582a 100644 --- a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs +++ b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs @@ -27,9 +27,9 @@ using System; using System.Collections.Generic; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Types +namespace OpenSim.Region.Framework.Scenes.Types { public class BasicQuadTreeNode { diff --git a/OpenSim/Region/Environment/Types/UpdateQueue.cs b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs similarity index 98% rename from OpenSim/Region/Environment/Types/UpdateQueue.cs rename to OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs index 0c86df21ee..452ada917d 100644 --- a/OpenSim/Region/Environment/Types/UpdateQueue.cs +++ b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs @@ -30,9 +30,9 @@ using System.Collections.Generic; using System.Runtime.Serialization; using System.Security.Permissions; using OpenMetaverse; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Types +namespace OpenSim.Region.Framework.Scenes.Types { [Serializable] public class UpdateQueue : ISerializable diff --git a/OpenSim/Region/Environment/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs similarity index 98% rename from OpenSim/Region/Environment/Scenes/UndoState.cs rename to OpenSim/Region/Framework/Scenes/UndoState.cs index d828d8dd9b..3d48229655 100644 --- a/OpenSim/Region/Environment/Scenes/UndoState.cs +++ b/OpenSim/Region/Framework/Scenes/UndoState.cs @@ -27,7 +27,7 @@ using OpenMetaverse; -namespace OpenSim.Region.Environment.Scenes +namespace OpenSim.Region.Framework.Scenes { public class UndoState { diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Framework/StorageManager.cs similarity index 97% rename from OpenSim/Region/Environment/StorageManager.cs rename to OpenSim/Region/Framework/StorageManager.cs index c9057f2cbc..db9359f9df 100644 --- a/OpenSim/Region/Environment/StorageManager.cs +++ b/OpenSim/Region/Framework/StorageManager.cs @@ -28,9 +28,9 @@ using System; using System.Reflection; using log4net; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment +namespace OpenSim.Region.Framework { public class StorageManager { diff --git a/OpenSim/Region/Modules/Python/PythonModule.cs b/OpenSim/Region/Modules/Python/PythonModule.cs index d86f830bdb..5dedac2bfb 100644 --- a/OpenSim/Region/Modules/Python/PythonModule.cs +++ b/OpenSim/Region/Modules/Python/PythonModule.cs @@ -33,8 +33,8 @@ using System.Text; using IronPython.Hosting; using log4net; using Nini.Config; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Modules.Python { diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs index ea389d64af..6e3b620f5b 100644 --- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs +++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs @@ -32,10 +32,10 @@ using System.Reflection; using System.Timers; using log4net; using Nini.Config; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Environment.Modules.World.Serialiser; using OpenSim.Region.Environment.Modules.World.Terrain; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using PumaCode.SvnDotNet.AprSharp; using PumaCode.SvnDotNet.SubversionSharp; using Slash=System.IO.Path; diff --git a/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs b/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs index 6c860e7b59..8dd747899b 100644 --- a/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs +++ b/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs @@ -26,7 +26,7 @@ */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes; diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs index 09dbc40f14..7eb00a7af3 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs @@ -31,10 +31,9 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; using OpenSim.Region.Environment; -using OpenSim.Region.Interfaces; using OpenSim.Region; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.ScriptEngine.Shared; namespace OpenSim.Region.ScriptEngine.DotNetEngine diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs index 5ac57c2487..01cbb72ff3 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs @@ -35,8 +35,8 @@ using System.Globalization; using OpenMetaverse; using log4net; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Scenes.Scripting; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Scenes.Scripting; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Shared.CodeTools; diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 28e1278088..f1f5f4bada 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs @@ -30,11 +30,10 @@ using System.Collections.Generic; using System.Reflection; using log4net; using Nini.Config; -using OpenSim.Region.Interfaces; using OpenSim.Framework; using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.ScriptEngine.Interfaces; using OpenMetaverse; using OpenMetaverse.StructuredData; diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 2631867294..3de3aad32f 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs @@ -33,7 +33,7 @@ using System.Runtime.Remoting.Lifetime; using log4net; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.ScriptEngine.Interfaces; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Shared.Api; diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs index e94de68747..707a7f7d68 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs @@ -27,7 +27,7 @@ using System; using OpenMetaverse; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.ScriptEngine.Interfaces diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs index 04af705859..84baa64667 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs @@ -28,7 +28,7 @@ using log4net; using System; using OpenSim.Region.ScriptEngine.Shared; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenMetaverse; using Nini.Config; using OpenSim.Region.ScriptEngine.Interfaces; diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 71a8d0fc1e..cc71bab3c8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs @@ -31,7 +31,7 @@ using System.Collections.Generic; using System.Threading; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.ScriptEngine.Interfaces; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; @@ -234,8 +234,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_Timer[engine].UnSetTimerEvents(localID, itemID); // Remove from: HttpRequest - IHttpRequests iHttpReq = - engine.World.RequestModuleInterface(); + IHttpRequestModule iHttpReq = + engine.World.RequestModuleInterface(); iHttpReq.StopHttpRequest(localID, itemID); IWorldComm comms = engine.World.RequestModuleInterface(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7564c69326..14846381b9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -38,12 +38,11 @@ using OpenSim; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Environment; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; using OpenSim.Region.Environment.Modules.World.Land; using OpenSim.Region.Environment.Modules.World.Terrain; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; @@ -8454,8 +8453,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // in StartHttpRequest m_host.AddScriptLPS(1); - IHttpRequests httpScriptMod = - m_ScriptEngine.World.RequestModuleInterface(); + IHttpRequestModule httpScriptMod = + m_ScriptEngine.World.RequestModuleInterface(); List param = new List(); foreach (object o in parameters.Data) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 734b3ef533..fa09b0a681 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -35,8 +35,8 @@ using Nini.Config; using OpenSim; using OpenSim.Framework; using OpenSim.Framework.Console; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; using OpenSim.Region.ScriptEngine.Shared.ScriptBase; diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs index f5a965b729..4c7dc8db35 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs @@ -26,7 +26,7 @@ */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Environment.Modules.Scripting.HttpRequest; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Interfaces; @@ -48,13 +48,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins if (m_CmdManager.m_ScriptEngine.World == null) return; - IHttpRequests iHttpReq = - m_CmdManager.m_ScriptEngine.World.RequestModuleInterface(); + IHttpRequestModule iHttpReq = + m_CmdManager.m_ScriptEngine.World.RequestModuleInterface(); HttpRequestClass httpInfo = null; if (iHttpReq != null) - httpInfo = iHttpReq.GetNextCompletedRequest(); + httpInfo = (HttpRequestClass)iHttpReq.GetNextCompletedRequest(); while (httpInfo != null) { @@ -67,24 +67,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins // implemented here yet anyway. Should be fixed if/when maxsize // is supported - iHttpReq.RemoveCompletedRequest(httpInfo.reqID); + iHttpReq.RemoveCompletedRequest(httpInfo.ReqID); object[] resobj = new object[] { - new LSL_Types.LSLString(httpInfo.reqID.ToString()), - new LSL_Types.LSLInteger(httpInfo.status), + new LSL_Types.LSLString(httpInfo.ReqID.ToString()), + new LSL_Types.LSLInteger(httpInfo.Status), new LSL_Types.list(), - new LSL_Types.LSLString(httpInfo.response_body) + new LSL_Types.LSLString(httpInfo.ResponseBody) }; foreach (IScriptEngine e in m_CmdManager.ScriptEngines) { - if (e.PostObjectEvent(httpInfo.localID, + if (e.PostObjectEvent(httpInfo.LocalID, new EventParams("http_response", resobj, new DetectParams[0]))) break; } - httpInfo = iHttpReq.GetNextCompletedRequest(); + httpInfo = (HttpRequestClass)iHttpReq.GetNextCompletedRequest(); } } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs index b72d17cde3..eba52bf5fb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs @@ -27,7 +27,7 @@ using System; using OpenMetaverse; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Environment.Modules.Scripting.WorldComm; using OpenSim.Region.ScriptEngine.Interfaces; using OpenSim.Region.ScriptEngine.Shared; @@ -56,7 +56,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins { while (comms.HasMessages()) { - ListenerInfo lInfo = comms.GetNextMessage(); + ListenerInfo lInfo = (ListenerInfo)comms.GetNextMessage(); //Deliver data to prim's listen handler object[] resobj = new object[] diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 808d8801d6..f13251823e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.ScriptEngine.Shared; using 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 a7699a1811..bf1a923d22 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs @@ -26,7 +26,7 @@ */ using System; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; using OpenSim.Region.ScriptEngine.Interfaces; using OpenSim.Region.ScriptEngine.Shared; @@ -52,7 +52,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins if (xmlrpc != null) { - RPCRequestInfo rInfo = xmlrpc.GetNextCompletedRequest(); + RPCRequestInfo rInfo = (RPCRequestInfo)xmlrpc.GetNextCompletedRequest(); while (rInfo != null) { @@ -80,10 +80,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins break; } - rInfo = xmlrpc.GetNextCompletedRequest(); + rInfo = (RPCRequestInfo)xmlrpc.GetNextCompletedRequest(); } - SendRemoteDataRequest srdInfo = xmlrpc.GetNextCompletedSRDRequest(); + SendRemoteDataRequest srdInfo = (SendRemoteDataRequest)xmlrpc.GetNextCompletedSRDRequest(); while (srdInfo != null) { @@ -93,23 +93,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins object[] resobj = new object[] { new LSL_Types.LSLInteger(3), - new LSL_Types.LSLString(srdInfo.channel.ToString()), + new LSL_Types.LSLString(srdInfo.Channel.ToString()), new LSL_Types.LSLString(srdInfo.GetReqID().ToString()), new LSL_Types.LSLString(String.Empty), - new LSL_Types.LSLInteger(srdInfo.idata), - new LSL_Types.LSLString(srdInfo.sdata) + new LSL_Types.LSLInteger(srdInfo.Idata), + new LSL_Types.LSLString(srdInfo.Sdata) }; foreach (IScriptEngine e in m_CmdManager.ScriptEngines) { if (e.PostScriptEvent( - srdInfo.m_itemID, new EventParams( + srdInfo.ItemID, new EventParams( "remote_data", resobj, new DetectParams[0]))) break; } - srdInfo = xmlrpc.GetNextCompletedSRDRequest(); + srdInfo = (SendRemoteDataRequest)xmlrpc.GetNextCompletedSRDRequest(); } } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 3817a078ec..ceb0f372cf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -31,7 +31,7 @@ using System.Threading; using System.Reflection; using System.Collections; using System.Collections.Generic; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.ScriptEngine.Interfaces; using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; 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 708afabb57..3cd6b76d06 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 @@ -34,6 +34,7 @@ + diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 195f48abb1..0f4e7e5367 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs @@ -33,7 +33,7 @@ using System.IO; using Microsoft.CSharp; using Microsoft.JScript; using Microsoft.VisualBasic; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.ScriptEngine.Interfaces; namespace OpenSim.Region.ScriptEngine.Shared.CodeTools diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index b9ff0cdfcf..777cb12be5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs @@ -34,7 +34,7 @@ using System.Runtime.Serialization; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.ScriptEngine.Shared { diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index f808f12df7..6b04248f90 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs @@ -42,8 +42,8 @@ using Nini.Config; using Amib.Threading; using OpenSim.Framework; using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Shared.Api; using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs index c06960b83a..7e8d6901c1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs @@ -40,8 +40,8 @@ using Nini.Config; using Amib.Threading; using OpenSim.Framework; using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Shared.Api; using OpenSim.Region.ScriptEngine.Shared.ScriptBase; diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 8355b60b96..09f751f52b 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs @@ -31,9 +31,8 @@ using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Interfaces; diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index f0f867b2c0..2cb18ea77b 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -41,10 +41,9 @@ using log4net; using Nini.Config; using Amib.Threading; using OpenSim.Framework; -using OpenSim.Region.Interfaces; using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Shared.ScriptBase; using OpenSim.Region.ScriptEngine.Shared.CodeTools; diff --git a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs b/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs index bbaaf447e0..a20e70f8b6 100644 --- a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs +++ b/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs @@ -32,7 +32,7 @@ using System.Reflection; using System.Text; using Mono.Data.SqliteClient; using OpenMetaverse; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Statistics; namespace OpenSim.Region.UserStatistics diff --git a/OpenSim/Region/UserStatistics/Clients_report.cs b/OpenSim/Region/UserStatistics/Clients_report.cs index 69514fb051..b2bb33bf84 100644 --- a/OpenSim/Region/UserStatistics/Clients_report.cs +++ b/OpenSim/Region/UserStatistics/Clients_report.cs @@ -31,7 +31,7 @@ using System.Collections.Generic; using System.Text; using Mono.Data.SqliteClient; using OpenMetaverse; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.UserStatistics { diff --git a/OpenSim/Region/UserStatistics/Default_Report.cs b/OpenSim/Region/UserStatistics/Default_Report.cs index 55cb45413e..668fd45f11 100644 --- a/OpenSim/Region/UserStatistics/Default_Report.cs +++ b/OpenSim/Region/UserStatistics/Default_Report.cs @@ -32,7 +32,7 @@ using System.Reflection; using System.Text; using Mono.Data.SqliteClient; using OpenMetaverse; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Statistics; diff --git a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs b/OpenSim/Region/UserStatistics/LogLinesAJAX.cs index 1f55d512af..85d2e037b2 100644 --- a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs +++ b/OpenSim/Region/UserStatistics/LogLinesAJAX.cs @@ -33,7 +33,7 @@ using System.Text; using System.Text.RegularExpressions; using Mono.Data.SqliteClient; using OpenMetaverse; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Statistics; namespace OpenSim.Region.UserStatistics diff --git a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs index be213aa9f5..8c04e71a61 100644 --- a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs +++ b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs @@ -32,7 +32,7 @@ using System.Reflection; using System.Text; using Mono.Data.SqliteClient; using OpenMetaverse; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Statistics; namespace OpenSim.Region.UserStatistics diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs index cb3b29266b..e7185607c0 100644 --- a/OpenSim/Region/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs @@ -39,8 +39,8 @@ using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Framework; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using Mono.Data.SqliteClient; diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs index 064161308a..a3bfebf8e8 100644 --- a/OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs +++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs @@ -29,10 +29,10 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.ScriptEngine.Shared; -using EventParams=OpenSim.ScriptEngine.Shared.EventParams; +using EventParams = OpenSim.ScriptEngine.Shared.EventParams; namespace OpenSim.ScriptEngine.Components.DotNetEngine.Events { diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs index e70cb91a02..dd72dbfa5e 100644 --- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs +++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs @@ -34,7 +34,7 @@ using System.Threading; using log4net; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.ScriptEngine.Interfaces; using OpenSim.Region.ScriptEngine.Shared.ScriptBase; using OpenSim.ScriptEngine.Shared; diff --git a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs b/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs index 3666ca4d82..d883e2f569 100644 --- a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs +++ b/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs @@ -33,8 +33,8 @@ using log4net; using Nini.Config; using OpenMetaverse; using OpenSim.ApplicationPlugins.ScriptEngine; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.ScriptEngine.Components.DotNetEngine.Events; using OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler; using OpenSim.ScriptEngine.Shared; diff --git a/OpenSim/ScriptEngine/Shared/IScriptEngine.cs b/OpenSim/ScriptEngine/Shared/IScriptEngine.cs index 6148d8d7f6..9e7bd0cc2a 100644 --- a/OpenSim/ScriptEngine/Shared/IScriptEngine.cs +++ b/OpenSim/ScriptEngine/Shared/IScriptEngine.cs @@ -28,8 +28,8 @@ using System; using System.Collections.Generic; using System.Text; using Nini.Config; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.ScriptEngine.Shared { diff --git a/OpenSim/ScriptEngine/Shared/RegionInfoStructure.cs b/OpenSim/ScriptEngine/Shared/RegionInfoStructure.cs index b450f317ac..693f38c0ba 100644 --- a/OpenSim/ScriptEngine/Shared/RegionInfoStructure.cs +++ b/OpenSim/ScriptEngine/Shared/RegionInfoStructure.cs @@ -30,10 +30,10 @@ using System.Collections.Generic; using System.Reflection; using log4net; using Nini.Config; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.ScriptEngine.Shared; -using EventParams=OpenSim.ScriptEngine.Shared.EventParams; +using EventParams = OpenSim.ScriptEngine.Shared.EventParams; namespace OpenSim.ScriptEngine.Shared { diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index f899375bed..5f02524b26 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs @@ -33,8 +33,8 @@ using log4net; using OpenMetaverse; using OpenMetaverse.Packets; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Tests.Common.Mock { diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs index 5e9b9ff7a5..761ef44c2f 100644 --- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs +++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs @@ -28,7 +28,7 @@ using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Tests.Common.Mock { diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 04b3e74831..00920c8ad1 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs @@ -30,8 +30,8 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Tests.Common.Mock { diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 61c2e5ed18..5540141444 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs @@ -33,10 +33,10 @@ using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; using OpenSim.Region.Physics.Manager; -using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.Agent.Capabilities; -using OpenSim.Region.Environment.Scenes; using OpenSim.Tests.Common.Mock; namespace OpenSim.Tests.Common.Setup diff --git a/prebuild.xml b/prebuild.xml index a88b332076..5e8495ee1d 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -506,31 +506,6 @@ - - - - ../../../bin/ - - - - - ../../../bin/ - - - - ../../../bin/ - - - - - - - - - - - - @@ -553,7 +528,7 @@ - + @@ -570,6 +545,54 @@ + + + + ../../../bin/ + + + + + ../../../bin/ + + + + ../../../bin/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -844,8 +867,10 @@ + + - + @@ -868,6 +893,7 @@ + @@ -891,8 +917,7 @@ - - + @@ -919,7 +944,7 @@ - + @@ -956,9 +981,8 @@ - + - @@ -995,7 +1019,7 @@ - + @@ -1023,7 +1047,7 @@ - + @@ -1046,6 +1070,7 @@ ../../../../../../bin/ + @@ -1072,6 +1097,7 @@ + @@ -1107,6 +1133,7 @@ + @@ -1177,6 +1204,7 @@ + @@ -1213,6 +1241,7 @@ + @@ -1246,6 +1275,7 @@ + @@ -1284,6 +1314,7 @@ + @@ -1323,6 +1354,7 @@ + @@ -1351,7 +1383,7 @@ - + @@ -1386,7 +1418,7 @@ - + @@ -1418,7 +1450,7 @@ - + @@ -1453,7 +1485,7 @@ - + @@ -1489,7 +1521,7 @@ - + @@ -1552,6 +1584,7 @@ + @@ -1588,6 +1621,7 @@ + @@ -1657,7 +1691,7 @@ - + @@ -1689,7 +1723,7 @@ - + @@ -1727,7 +1761,7 @@ - + @@ -1767,7 +1801,7 @@ - + @@ -1809,7 +1843,7 @@ - + @@ -1869,7 +1903,7 @@ - + @@ -1907,7 +1941,7 @@ - + @@ -1948,7 +1982,7 @@ - + @@ -1987,7 +2021,7 @@ - + @@ -2027,7 +2061,7 @@ - + @@ -2068,7 +2102,7 @@ - + @@ -2109,7 +2143,7 @@ - + @@ -2149,7 +2183,7 @@ - + @@ -2193,7 +2227,7 @@ - + @@ -2301,6 +2335,7 @@ + @@ -2330,6 +2365,7 @@ + @@ -2367,7 +2403,7 @@ - + @@ -2401,7 +2437,7 @@ - + @@ -2440,7 +2476,7 @@ - + @@ -2565,7 +2601,7 @@ - + @@ -2624,7 +2660,7 @@ - +