aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2009-02-06 16:55:34 +0000
committerDr Scofield2009-02-06 16:55:34 +0000
commit9b66108081a8c8cf79faaa6c541554091c40850e (patch)
tree095a232ae5a9de3a9244bcd34da08294f61eeea5
parent* removed superfluous constants class (diff)
downloadopensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.zip
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.gz
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.bz2
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.xz
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!
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs13
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs2
-rw-r--r--OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs4
-rw-r--r--OpenSim/Data/MSSQL/MSSQLEstateData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs4
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs2
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLGridTest.cs2
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs2
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs2
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLUserTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs6
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs2
-rw-r--r--OpenSim/Data/Null/NullDataStore.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs4
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs2
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs2
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs2
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs2
-rw-r--r--OpenSim/Data/Tests/BasicAssetTest.cs2
-rw-r--r--OpenSim/Data/Tests/BasicGridTest.cs2
-rw-r--r--OpenSim/Data/Tests/BasicInventoryTest.cs2
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs4
-rw-r--r--OpenSim/Data/Tests/BasicUserTest.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs10
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs2
-rw-r--r--OpenSim/Framework/IMoneyModule.cs (renamed from OpenSim/Region/Interfaces/IMoneyModule.cs)2
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs7
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs5
-rw-r--r--OpenSim/Region/ClientStack/IClientNetworkServer.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs27
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs4
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs2
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs3
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs2
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs6
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs2
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/EstateSnapshot.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/SnapshotStore.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs77
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs74
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs183
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs110
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandObject.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs6
-rw-r--r--OpenSim/Region/Examples/SimpleModule/ComplexObject.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/RegionModule.cs4
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs (renamed from OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs)5
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs (renamed from OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs)4
-rw-r--r--OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs (renamed from OpenSim/Region/Environment/Interfaces/ICapabilitiesModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ICommand.cs (renamed from OpenSim/Region/Environment/Interfaces/ICommand.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ICommandableModule.cs (renamed from OpenSim/Region/Environment/Interfaces/ICommandableModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ICommander.cs (renamed from OpenSim/Region/Environment/Interfaces/ICommander.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IDialogModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IDialogModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs (renamed from OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEmailModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IEmailModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityCreator.cs (renamed from OpenSim/Region/Environment/Interfaces/IEntityCreator.cs)4
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityInventory.cs (renamed from OpenSim/Region/Environment/Interfaces/IEntityInventory.cs)7
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs (renamed from OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEstateModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IEstateModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEventQueue.cs (renamed from OpenSim/Region/Interfaces/IEventQueue.cs)25
-rw-r--r--OpenSim/Region/Framework/Interfaces/IFriendsModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IFriendsModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IGroupsModule.cs (renamed from OpenSim/Region/Interfaces/IGroupsModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IHttpRequests.cs (renamed from OpenSim/Region/Environment/Interfaces/IHttpRequests.cs)17
-rw-r--r--OpenSim/Region/Framework/Interfaces/IInterregionComms.cs (renamed from OpenSim/Region/Environment/Interfaces/IInterregionComms.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs)5
-rw-r--r--OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs (renamed from OpenSim/Region/Environment/Interfaces/IJ2KDecoder.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ILandChannel.cs (renamed from OpenSim/Region/Environment/Interfaces/ILandChannel.cs)4
-rw-r--r--OpenSim/Region/Framework/Interfaces/ILandObject.cs (renamed from OpenSim/Region/Environment/Interfaces/ILandObject.cs)4
-rw-r--r--OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs (renamed from OpenSim/Region/Interfaces/IMessageTransferModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IPresenceModule.cs (renamed from OpenSim/Region/Interfaces/IPresenceModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs (renamed from OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs)4
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IRegionModule.cs)4
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs)4
-rw-r--r--OpenSim/Region/Framework/Interfaces/IScriptModule.cs (renamed from OpenSim/Region/Interfaces/IScriptModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IServiceRequest.cs45
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISoundModule.cs (renamed from OpenSim/Region/Environment/Interfaces/ISoundModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ITerrain.cs (renamed from OpenSim/Region/Environment/Interfaces/ITerrain.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs (renamed from OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ITextureSender.cs (renamed from OpenSim/Region/Environment/Interfaces/ITextureSender.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IVegetationModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IVegetationModule.cs)4
-rw-r--r--OpenSim/Region/Framework/Interfaces/IWindModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IWindModule.cs)2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IWorldComm.cs (renamed from OpenSim/Region/Environment/Interfaces/IWorldComm.cs)24
-rw-r--r--OpenSim/Region/Framework/Interfaces/IXMLRPC.cs (renamed from OpenSim/Region/Environment/Interfaces/IXMLRPC.cs)26
-rw-r--r--OpenSim/Region/Framework/Interfaces/IXfer.cs (renamed from OpenSim/Region/Environment/Interfaces/IXfer.cs)2
-rw-r--r--OpenSim/Region/Framework/ModuleLoader.cs (renamed from OpenSim/Region/Environment/ModuleLoader.cs)88
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation.cs (renamed from OpenSim/Region/Environment/Scenes/Animation.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/AnimationSet.cs (renamed from OpenSim/Region/Environment/Scenes/AnimationSet.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs (renamed from OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/AvatarAnimations.cs (renamed from OpenSim/Region/Environment/Scenes/AvatarAnimations.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityBase.cs (renamed from OpenSim/Region/Environment/Scenes/EntityBase.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityManager.cs (renamed from OpenSim/Region/Environment/Scenes/EntityManager.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs (renamed from OpenSim/Region/Environment/Scenes/EventManager.cs)7
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs (renamed from OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs (renamed from OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs (renamed from OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs (renamed from OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs)19
-rw-r--r--OpenSim/Region/Framework/Scenes/IScenePresenceBody.cs (renamed from OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/ReturnInfo.cs (renamed from OpenSim/Region/Environment/Scenes/ReturnInfo.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs (renamed from OpenSim/Region/Environment/Scenes/Scene.Inventory.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs (renamed from OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Permissions.cs (renamed from OpenSim/Region/Environment/Scenes/Scene.Permissions.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs (renamed from OpenSim/Region/Environment/Scenes/Scene.cs)26
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs (renamed from OpenSim/Region/Environment/Scenes/SceneBase.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs (renamed from OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs)27
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs (renamed from OpenSim/Region/Environment/Scenes/SceneGraph.cs)15
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs (renamed from OpenSim/Region/Environment/Scenes/SceneManager.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs (renamed from OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs (renamed from OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs (renamed from OpenSim/Region/Environment/Scenes/SceneObjectPart.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (renamed from OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs)7
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs (renamed from OpenSim/Region/Environment/Scenes/ScenePresence.cs)14
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs (renamed from OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs (renamed from OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs (renamed from OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineInterface.cs (renamed from OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs (renamed from OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/SimStatsReporter.cs (renamed from OpenSim/Region/Environment/Scenes/SimStatsReporter.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/TerrainChannel.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/TerrainUtil.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs (renamed from OpenSim/Region/Environment/Scenes/Tests/EntityManagerTests.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs (renamed from OpenSim/Region/Environment/Scenes/Tests/SceneObjectBasicTests.cs)0
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs (renamed from OpenSim/Region/Environment/Scenes/Tests/SceneObjectLinkingTests.cs)0
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs (renamed from OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs (renamed from OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs (renamed from OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs (renamed from OpenSim/Region/Environment/Types/UpdateQueue.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/UndoState.cs (renamed from OpenSim/Region/Environment/Scenes/UndoState.cs)2
-rw-r--r--OpenSim/Region/Framework/StorageManager.cs (renamed from OpenSim/Region/Environment/StorageManager.cs)4
-rw-r--r--OpenSim/Region/Modules/Python/PythonModule.cs4
-rw-r--r--OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs4
-rw-r--r--OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs9
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs18
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Helpers.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/EventManager.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs5
-rw-r--r--OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs2
-rw-r--r--OpenSim/Region/UserStatistics/Clients_report.cs2
-rw-r--r--OpenSim/Region/UserStatistics/Default_Report.cs2
-rw-r--r--OpenSim/Region/UserStatistics/LogLinesAJAX.cs2
-rw-r--r--OpenSim/Region/UserStatistics/SimStatsAJAX.cs2
-rw-r--r--OpenSim/Region/UserStatistics/WebStatsModule.cs4
-rw-r--r--OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs4
-rw-r--r--OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs2
-rw-r--r--OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs4
-rw-r--r--OpenSim/ScriptEngine/Shared/IScriptEngine.cs4
-rw-r--r--OpenSim/ScriptEngine/Shared/RegionInfoStructure.cs4
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs4
-rw-r--r--OpenSim/Tests/Common/Mock/TestLandChannel.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs4
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs6
-rw-r--r--prebuild.xml136
327 files changed, 1087 insertions, 904 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index c043363..024c910 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -34,6 +34,12 @@ using OpenSim.Framework;
34using OpenSim.Framework.RegionLoader.Filesystem; 34using OpenSim.Framework.RegionLoader.Filesystem;
35using OpenSim.Framework.RegionLoader.Web; 35using OpenSim.Framework.RegionLoader.Web;
36 36
37using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
38using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
39using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
40using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
41using OpenSim.Region.Environment.Modules.Agent.AssetTransaction;
42
37namespace OpenSim.ApplicationPlugins.LoadRegions 43namespace OpenSim.ApplicationPlugins.LoadRegions
38{ 44{
39 public class LoadRegionsPlugin : IApplicationPlugin 45 public class LoadRegionsPlugin : IApplicationPlugin
@@ -74,8 +80,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
74 regionLoader.SetIniConfigSource(openSim.ConfigSource.Source); 80 regionLoader.SetIniConfigSource(openSim.ConfigSource.Source);
75 RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); 81 RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
76 82
77 openSim.ModuleLoader.LoadDefaultSharedModules(); 83 openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
78 84 openSim.ModuleLoader.LoadDefaultSharedModule(new InstantMessageModule());
85 openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
86 openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule());
87 openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule());
79 if (!CheckRegionsForSanity(regionsToLoad)) 88 if (!CheckRegionsForSanity(regionsToLoad))
80 { 89 {
81 m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations"); 90 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 d9cf5bd..a036371 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -37,9 +37,9 @@ using Nini.Config;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Environment.Modules.World.Terrain; 42using OpenSim.Region.Environment.Modules.World.Terrain;
42using OpenSim.Region.Environment.Scenes;
43using System.Collections.Generic; 43using System.Collections.Generic;
44 44
45namespace OpenSim.ApplicationPlugins.RemoteController 45namespace OpenSim.ApplicationPlugins.RemoteController
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
index bd42473..4a98834 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
@@ -33,7 +33,7 @@ using System.IO;
33using System.Threading; 33using System.Threading;
34using System.Xml; 34using System.Xml;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index 35b4d8a..8537da5 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -44,8 +44,8 @@ using OpenSim.Framework;
44using OpenSim.Framework.Console; 44using OpenSim.Framework.Console;
45using OpenSim.Framework.Servers; 45using OpenSim.Framework.Servers;
46using OpenSim.Framework.Communications; 46using OpenSim.Framework.Communications;
47using OpenSim.Region.Environment.Interfaces; 47using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Environment.Scenes; 48using OpenSim.Region.Framework.Scenes;
49using OpenSim.ApplicationPlugins.Rest; 49using OpenSim.ApplicationPlugins.Rest;
50 50
51namespace OpenSim.ApplicationPlugins.Rest.Regions 51namespace OpenSim.ApplicationPlugins.Rest.Regions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
index 932f512..ab7e1ec 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
@@ -44,8 +44,8 @@ using OpenSim.Framework;
44using OpenSim.Framework.Console; 44using OpenSim.Framework.Console;
45using OpenSim.Framework.Servers; 45using OpenSim.Framework.Servers;
46using OpenSim.Framework.Communications; 46using OpenSim.Framework.Communications;
47using OpenSim.Region.Environment.Interfaces; 47using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Environment.Scenes; 48using OpenSim.Region.Framework.Scenes;
49using OpenSim.ApplicationPlugins.Rest; 49using OpenSim.ApplicationPlugins.Rest;
50 50
51namespace OpenSim.ApplicationPlugins.Rest.Regions 51namespace OpenSim.ApplicationPlugins.Rest.Regions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
index 21caf84..80c2aa3 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
@@ -31,7 +31,7 @@ using System.Collections;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Xml.Serialization; 32using System.Xml.Serialization;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.ApplicationPlugins.Rest.Regions 36namespace OpenSim.ApplicationPlugins.Rest.Regions
37{ 37{
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
index 4c24f3f..2d13b6b 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
@@ -43,7 +43,7 @@ using OpenSim.Framework;
43using OpenSim.Framework.Console; 43using OpenSim.Framework.Console;
44using OpenSim.Framework.Servers; 44using OpenSim.Framework.Servers;
45using OpenSim.Framework.Communications; 45using OpenSim.Framework.Communications;
46using OpenSim.Region.Environment.Scenes; 46using OpenSim.Region.Framework.Scenes;
47using OpenSim.ApplicationPlugins.Rest; 47using OpenSim.ApplicationPlugins.Rest;
48 48
49namespace OpenSim.ApplicationPlugins.Rest.Regions 49namespace OpenSim.ApplicationPlugins.Rest.Regions
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index ba0d2d1..58dd729 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -41,7 +41,7 @@ using OpenSim.Framework;
41using OpenSim.Framework.Console; 41using OpenSim.Framework.Console;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.Framework.Communications; 43using OpenSim.Framework.Communications;
44using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Framework.Scenes;
45 45
46namespace OpenSim.ApplicationPlugins.Rest 46namespace OpenSim.ApplicationPlugins.Rest
47{ 47{
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs
index 998f017..bc07ca7 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs
@@ -30,8 +30,8 @@ using System.Reflection;
30using System.Text; 30using System.Text;
31using log4net; 31using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.ScriptEngine.Shared; 35using OpenSim.ScriptEngine.Shared;
36 36
37namespace OpenSim.ApplicationPlugins.ScriptEngine 37namespace OpenSim.ApplicationPlugins.ScriptEngine
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index 56855f6..8fd47a0 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -33,7 +33,7 @@ using System.Reflection;
33using OpenMetaverse; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37 37
38namespace OpenSim.Data.MSSQL 38namespace OpenSim.Data.MSSQL
39{ 39{
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 2388207..d77afc9 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -35,8 +35,8 @@ using System.Reflection;
35using OpenMetaverse; 35using OpenMetaverse;
36using log4net; 36using log4net;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Data.MSSQL 41namespace OpenSim.Data.MSSQL
42{ 42{
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 57151b3..f811d84 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -35,8 +35,8 @@ using OpenMetaverse;
35using log4net; 35using log4net;
36using MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Data.MySQL 41namespace OpenSim.Data.MySQL
42{ 42{
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index e1ddb54..ab55ba5 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -36,8 +36,8 @@ using OpenMetaverse;
36using log4net; 36using log4net;
37using MySql.Data.MySqlClient; 37using MySql.Data.MySqlClient;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Data.MySQL 42namespace OpenSim.Data.MySQL
43{ 43{
diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
index 0419e21..0f7c9cd 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL; 35using OpenSim.Data.MySQL;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.MySQL.Tests 39namespace OpenSim.Data.MySQL.Tests
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
index e6df085..4638bca 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL; 35using OpenSim.Data.MySQL;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.MySQL.Tests 39namespace OpenSim.Data.MySQL.Tests
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
index 6f95c6c..8c7d820 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL; 35using OpenSim.Data.MySQL;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38using log4net;
39 39
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
index aed4cea..71e73c2 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL; 35using OpenSim.Data.MySQL;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.MySQL.Tests 39namespace OpenSim.Data.MySQL.Tests
diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
index c036f6c..8448dd7 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL; 35using OpenSim.Data.MySQL;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.MySQL.Tests 39namespace OpenSim.Data.MySQL.Tests
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index b8b1863..29f4106 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -36,9 +36,9 @@ using log4net;
36using NHibernate; 36using NHibernate;
37using NHibernate.Criterion; 37using NHibernate.Criterion;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using Environment=NHibernate.Cfg.Environment; 41using Environment = NHibernate.Cfg.Environment;
42 42
43namespace OpenSim.Data.NHibernate 43namespace OpenSim.Data.NHibernate
44{ 44{
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
index b08bed9..d6c7f8f 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
index 01d3266..e70b32b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
@@ -32,7 +32,7 @@ using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Data.NHibernate; 37using OpenSim.Data.NHibernate;
38 38
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
index 2754fe1..7500574 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38using log4net;
39 39
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
index 19d8a37..add8883 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
index d796bde..01b0236 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
index 9a47a0f..93b92ed 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
index 0abb8ee..c845d2c 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
@@ -32,7 +32,7 @@ using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Data.NHibernate; 37using OpenSim.Data.NHibernate;
38 38
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
index bea6c7d..f91d058 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38using log4net;
39 39
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
index 6e09f2a..4db8375 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
index df6a512..3bc0f4b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
index a5aa649..77bbb08 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
index a7a0c93..6e7d7af 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
@@ -32,7 +32,7 @@ using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Data.NHibernate; 37using OpenSim.Data.NHibernate;
38 38
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
index 23c1ec7..45c77f7 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38using log4net;
39 39
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
index 9e77d47..6e84110 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
index 1e8ba3c..90edbc2 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/Null/NullDataStore.cs b/OpenSim/Data/Null/NullDataStore.cs
index 94ad4af..9b1c0e2 100644
--- a/OpenSim/Data/Null/NullDataStore.cs
+++ b/OpenSim/Data/Null/NullDataStore.cs
@@ -28,8 +28,8 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Framework.Scenes;
33 33
34namespace OpenSim.Data.Null 34namespace OpenSim.Data.Null
35{ 35{
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index f95932d..46d29a3 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -35,8 +35,8 @@ using OpenMetaverse;
35using Mono.Data.SqliteClient; 35using Mono.Data.SqliteClient;
36using log4net; 36using log4net;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Data.SQLite 41namespace OpenSim.Data.SQLite
42{ 42{
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 306dcb8..89308db 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -36,8 +36,8 @@ using OpenMetaverse;
36using log4net; 36using log4net;
37using Mono.Data.SqliteClient; 37using Mono.Data.SqliteClient;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Data.SQLite 42namespace OpenSim.Data.SQLite
43{ 43{
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
index 993f5f5..0de965d 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite; 35using OpenSim.Data.SQLite;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.SQLite.Tests 39namespace OpenSim.Data.SQLite.Tests
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 571aa85..07b0dab 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite; 35using OpenSim.Data.SQLite;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38using log4net;
39 39
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index b188ead..86a1192 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite; 35using OpenSim.Data.SQLite;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.SQLite.Tests 39namespace OpenSim.Data.SQLite.Tests
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
index 68a10fb..0415219 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite; 35using OpenSim.Data.SQLite;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.SQLite.Tests 39namespace OpenSim.Data.SQLite.Tests
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 5993f96..10cd35f 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -31,7 +31,7 @@ using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
32using OpenSim.Data; 32using OpenSim.Data;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenMetaverse; 35using OpenMetaverse;
36 36
37namespace OpenSim.Data.Tests 37namespace OpenSim.Data.Tests
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs
index b9cf4cf..adf3879 100644
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ b/OpenSim/Data/Tests/BasicGridTest.cs
@@ -32,7 +32,7 @@ using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Data; 33using OpenSim.Data;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse; 36using OpenMetaverse;
37 37
38namespace OpenSim.Data.Tests 38namespace OpenSim.Data.Tests
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs
index 2e6226f..1e13ec4 100644
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -31,7 +31,7 @@ using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Data; 33using OpenSim.Data;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenMetaverse; 35using OpenMetaverse;
36 36
37namespace OpenSim.Data.Tests 37namespace OpenSim.Data.Tests
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index a0591fa..70d8f8a 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -33,8 +33,8 @@ using NUnit.Framework;
33using NUnit.Framework.SyntaxHelpers; 33using NUnit.Framework.SyntaxHelpers;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Data; 35using OpenSim.Data;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Environment.Modules.World.Land; 38using OpenSim.Region.Environment.Modules.World.Land;
39using OpenMetaverse; 39using OpenMetaverse;
40 40
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index e7e6b84..5464ade 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -34,7 +34,7 @@ using NUnit.Framework;
34using NUnit.Framework.SyntaxHelpers; 34using NUnit.Framework.SyntaxHelpers;
35using OpenSim.Data; 35using OpenSim.Data;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenMetaverse; 38using OpenMetaverse;
39 39
40namespace OpenSim.Data.Tests 40namespace OpenSim.Data.Tests
diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
index 1b3e70d..038c591 100644
--- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
@@ -163,8 +163,11 @@ namespace OpenSim.Framework.Communications.Cache
163 passwordIterations); 163 passwordIterations);
164 164
165 // Use the password to generate pseudo-random bytes for the encryption 165 // Use the password to generate pseudo-random bytes for the encryption
166 // key. Specify the size of the key in bytes (instead of bits). 166 // key. Specify the size of the key in bytes (instead
167 // of bits).
168 #pragma warning disable 0618
167 byte[] keyBytes = password.GetBytes(keySize / 8); 169 byte[] keyBytes = password.GetBytes(keySize / 8);
170 #pragma warning restore 0618
168 171
169 // Create uninitialized Rijndael encryption object. 172 // Create uninitialized Rijndael encryption object.
170 RijndaelManaged symmetricKey = new RijndaelManaged(); 173 RijndaelManaged symmetricKey = new RijndaelManaged();
@@ -276,8 +279,11 @@ namespace OpenSim.Framework.Communications.Cache
276 passwordIterations); 279 passwordIterations);
277 280
278 // Use the password to generate pseudo-random bytes for the encryption 281 // Use the password to generate pseudo-random bytes for the encryption
279 // key. Specify the size of the key in bytes (instead of bits). 282 // key. Specify the size of the key in bytes (instead
283 // of bits).
284 #pragma warning disable 0618
280 byte[] keyBytes = password.GetBytes(keySize / 8); 285 byte[] keyBytes = password.GetBytes(keySize / 8);
286 #pragma warning restore 0618
281 287
282 // Create uninitialized Rijndael encryption object. 288 // Create uninitialized Rijndael encryption object.
283 RijndaelManaged symmetricKey = new RijndaelManaged(); 289 RijndaelManaged symmetricKey = new RijndaelManaged();
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a370eea..25a69f7 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -35,7 +35,7 @@ using log4net;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Interfaces; 38// using OpenSim.Region.Framework.Interfaces;
39 39
40namespace OpenSim.Framework.Communications.Capabilities 40namespace OpenSim.Framework.Communications.Capabilities
41{ 41{
diff --git a/OpenSim/Region/Interfaces/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 5dfb64c..7904e94 100644
--- a/OpenSim/Region/Interfaces/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -29,7 +29,7 @@ using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Interfaces 32namespace OpenSim.Framework
33{ 33{
34 public delegate void ObjectPaid(UUID objectID, UUID agentID, int amount); 34 public delegate void ObjectPaid(UUID objectID, UUID agentID, int amount);
35 public interface IMoneyModule 35 public interface IMoneyModule
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 358370b..4941fb4 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -44,9 +44,10 @@ using OpenSim.Framework.Communications.Cache;
44using OpenSim.Region.Communications.Local; 44using OpenSim.Region.Communications.Local;
45using OpenSim.Region.Communications.Hypergrid; 45using OpenSim.Region.Communications.Hypergrid;
46using OpenSim.Region.Environment; 46using OpenSim.Region.Environment;
47using OpenSim.Region.Environment.Interfaces; 47using OpenSim.Region.Framework;
48using OpenSim.Region.Environment.Scenes; 48using OpenSim.Region.Framework.Interfaces;
49using OpenSim.Region.Environment.Scenes.Hypergrid; 49using OpenSim.Region.Framework.Scenes;
50using OpenSim.Region.Framework.Scenes.Hypergrid;
50 51
51using Timer = System.Timers.Timer; 52using Timer = System.Timers.Timer;
52 53
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 33621a9..0cd708b 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -39,8 +39,8 @@ using Nini.Config;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
41using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
42using OpenSim.Region.Environment.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Environment.Scenes; 43using OpenSim.Region.Framework.Scenes;
44using OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver; 44using OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver;
45using Timer=System.Timers.Timer; 45using Timer=System.Timers.Timer;
46 46
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 89f16d6..a7ff0e2 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -45,8 +45,9 @@ using OpenSim.Region.ClientStack;
45using OpenSim.Region.Communications.Local; 45using OpenSim.Region.Communications.Local;
46using OpenSim.Region.Communications.OGS1; 46using OpenSim.Region.Communications.OGS1;
47using OpenSim.Region.Environment; 47using OpenSim.Region.Environment;
48using OpenSim.Region.Environment.Interfaces; 48using OpenSim.Region.Framework;
49using OpenSim.Region.Environment.Scenes; 49using OpenSim.Region.Framework.Interfaces;
50using OpenSim.Region.Framework.Scenes;
50using OpenSim.Region.Physics.Manager; 51using OpenSim.Region.Physics.Manager;
51 52
52namespace OpenSim 53namespace OpenSim
diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
index 2d0630b..0073389 100644
--- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs
+++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
@@ -29,7 +29,7 @@ using System.Net;
29using System.Net.Sockets; 29using System.Net.Sockets;
30using Nini.Config; 30using Nini.Config;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34 34
35namespace OpenSim.Region.ClientStack 35namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 42dbbee..59df3f1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -41,9 +41,8 @@ using OpenSim.Framework;
41using OpenSim.Framework.Client; 41using OpenSim.Framework.Client;
42using OpenSim.Framework.Communications.Cache; 42using OpenSim.Framework.Communications.Cache;
43using OpenSim.Framework.Statistics; 43using OpenSim.Framework.Statistics;
44using OpenSim.Region.Interfaces; 44using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.Environment.Interfaces; 45using OpenSim.Region.Framework.Scenes;
46using OpenSim.Region.Environment.Scenes;
47using Timer = System.Timers.Timer; 46using Timer = System.Timers.Timer;
48 47
49namespace OpenSim.Region.ClientStack.LindenUDP 48namespace OpenSim.Region.ClientStack.LindenUDP
@@ -475,7 +474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
475 m_PacketHandler.OnPacketStats += PopulateStats; 474 m_PacketHandler.OnPacketStats += PopulateStats;
476 475
477 RegisterLocalPacketHandlers(); 476 RegisterLocalPacketHandlers();
478 m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<OpenSim.Region.Environment.Interfaces.IJ2KDecoder>()); 477 m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<OpenSim.Region.Framework.Interfaces.IJ2KDecoder>());
479 } 478 }
480 479
481 public void SetDebugPacketLevel(int newDebugPacketLevel) 480 public void SetDebugPacketLevel(int newDebugPacketLevel)
@@ -1214,20 +1213,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1214 { 1213 {
1215 dialog = 17; 1214 dialog = 17;
1216 1215
1217 OSD Item = Environment.EventQueueHelper.ChatterboxInvitation( 1216 eq.ChatterboxInvitation(
1218 new UUID("00000000-68f9-1111-024e-222222111123"), 1217 new UUID("00000000-68f9-1111-024e-222222111123"),
1219 "OpenSimulator Testing", fromAgent, message, toAgent, fromName, dialog, 0, 1218 "OpenSimulator Testing", fromAgent, message, toAgent, fromName, dialog, 0,
1220 false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket); 1219 false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket);
1221 1220
1222 eq.Enqueue(Item, toAgent); 1221 eq.ChatterBoxSessionAgentListUpdates(
1223 m_log.Info("########### eq ChatterboxInvitation #############\n" + Item);
1224
1225 Item = Environment.EventQueueHelper.ChatterBoxSessionAgentListUpdates(
1226 new UUID("00000000-68f9-1111-024e-222222111123"), 1222 new UUID("00000000-68f9-1111-024e-222222111123"),
1227 fromAgent, false, false, false); 1223 fromAgent, toAgent, false, false, false);
1228
1229 eq.Enqueue(Item, toAgent);
1230 m_log.Info("########### eq ChatterBoxSessionAgentListUpdates #############\n" + Item);
1231 } 1224 }
1232 1225
1233 System.Console.WriteLine("SendInstantMessage: " + msg); 1226 System.Console.WriteLine("SendInstantMessage: " + msg);
@@ -3193,9 +3186,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3193 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); 3186 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
3194 if (eq != null) 3187 if (eq != null)
3195 { 3188 {
3196 OSD Item = Environment.EventQueueHelper.ParcelProperties(updatePacket); 3189 eq.ParcelProperties(updatePacket, this.AgentId);
3197
3198 eq.Enqueue(Item, this.AgentId);
3199 } 3190 }
3200 } 3191 }
3201 catch (Exception ex) 3192 catch (Exception ex)
@@ -7608,9 +7599,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7608 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); 7599 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
7609 if (eq != null) 7600 if (eq != null)
7610 { 7601 {
7611 OSD Item = Environment.EventQueueHelper.GroupMembership(Groupupdate); 7602 eq.GroupMembership(Groupupdate, this.AgentId);
7612
7613 eq.Enqueue(Item, this.AgentId);
7614 } 7603 }
7615 } 7604 }
7616 catch (Exception ex) 7605 catch (Exception ex)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
index d2d86b9..b801f7a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
@@ -35,8 +35,8 @@ using OpenSim.Framework;
35using OpenSim.Framework.Client; 35using OpenSim.Framework.Client;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Statistics; 37using OpenSim.Framework.Statistics;
38using OpenSim.Region.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Region.ClientStack.LindenUDP 41namespace OpenSim.Region.ClientStack.LindenUDP
42{ 42{
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index f903c45..9b71770 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using C5; 33using C5;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenMetaverse.Imaging; 35using OpenMetaverse.Imaging;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 1615767..f53d485 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -36,7 +36,7 @@ using log4net;
36using Nini.Config; 36using Nini.Config;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Region.ClientStack.LindenUDP 41namespace OpenSim.Region.ClientStack.LindenUDP
42{ 42{
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
index 6880973..90d7d63 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
@@ -29,7 +29,7 @@ using System.Xml;
29using Nini.Config; 29using Nini.Config;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Framework.Scenes;
33 33
34namespace OpenSim.Region.ClientStack.LindenUDP.Tests 34namespace OpenSim.Region.ClientStack.LindenUDP.Tests
35{ 35{
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index cc3edff..0921dbd 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -36,8 +36,9 @@ using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
37using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Region.Framework;
40using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Environment; 41using OpenSim.Region.Environment;
40using OpenSim.Region.Environment.Scenes;
41using OpenSim.Region.Physics.Manager; 42using OpenSim.Region.Physics.Manager;
42 43
43namespace OpenSim.Region.ClientStack 44namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index eaaa7d2..c4d48a9 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -34,7 +34,7 @@ using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Communications.OGS1; 35using OpenSim.Region.Communications.OGS1;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Communications.Hypergrid 39namespace OpenSim.Region.Communications.Hypergrid
40{ 40{
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 961ecb1..a39161b 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -52,9 +52,9 @@ using OpenSim.Framework.Communications.Cache;
52using OpenSim.Framework.Servers; 52using OpenSim.Framework.Servers;
53using OpenSim.Region.Communications.Local; 53using OpenSim.Region.Communications.Local;
54using OpenSim.Region.Communications.OGS1; 54using OpenSim.Region.Communications.OGS1;
55using OpenSim.Region.Environment.Modules.Framework; 55// using OpenSim.Region.Environment.Modules.Framework;
56using OpenSim.Region.Environment.Scenes; 56using OpenSim.Region.Framework.Scenes;
57using OpenSim.Region.Interfaces; 57using OpenSim.Region.Framework.Interfaces;
58 58
59namespace OpenSim.Region.Communications.Hypergrid 59namespace OpenSim.Region.Communications.Hypergrid
60{ 60{
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index b64a070..b1f9f63 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Region.Communications.OGS1; 37using OpenSim.Region.Communications.OGS1;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Framework.Scenes;
39 39
40using OpenMetaverse; 40using OpenMetaverse;
41 41
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index c160696..27a7a0e 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.Region.Communications.Local; 43using OpenSim.Region.Communications.Local;
44using OpenSim.Region.Communications.OGS1; 44using OpenSim.Region.Communications.OGS1;
45using OpenSim.Region.Environment.Scenes; 45using OpenSim.Region.Framework.Scenes;
46 46
47using OpenMetaverse; 47using OpenMetaverse;
48using Nwc.XmlRpc; 48using Nwc.XmlRpc;
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index e2ea546..9af8914 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -31,7 +31,7 @@ using System.Collections;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Xml;
33using log4net; 33using log4net;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Framework.Communications.Capabilities; 35using OpenSim.Framework.Communications.Capabilities;
36using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 36using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
37using OpenMetaverse; 37using OpenMetaverse;
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 782b431..735e14b 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -39,8 +39,8 @@ using Nini.Config;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Region.DataSnapshot.Interfaces; 41using OpenSim.Region.DataSnapshot.Interfaces;
42using OpenSim.Region.Environment.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Environment.Scenes; 43using OpenSim.Region.Framework.Scenes;
44using OpenMetaverse.Packets; 44using OpenMetaverse.Packets;
45 45
46namespace OpenSim.Region.DataSnapshot 46namespace OpenSim.Region.DataSnapshot
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
index 8e7fa46..6865f49 100644
--- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
@@ -30,7 +30,7 @@ using System.Xml;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.DataSnapshot.Interfaces; 32using OpenSim.Region.DataSnapshot.Interfaces;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Framework.Scenes;
34 34
35namespace OpenSim.Region.DataSnapshot.Providers 35namespace OpenSim.Region.DataSnapshot.Providers
36{ 36{
diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
index 1519355..7762148 100644
--- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
+++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
@@ -28,7 +28,7 @@
28 28
29using System; 29using System;
30using System.Xml; 30using System.Xml;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.DataSnapshot.Interfaces 33namespace OpenSim.Region.DataSnapshot.Interfaces
34{ 34{
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 1a7da1b..bfc45fc 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -33,9 +33,9 @@ using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.DataSnapshot.Interfaces; 35using OpenSim.Region.DataSnapshot.Interfaces;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Modules.World.Land; 37using OpenSim.Region.Environment.Modules.World.Land;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenMetaverse.Packets; 39using OpenMetaverse.Packets;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41 41
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 6dc1e9c..6f7ff6b 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -31,8 +31,8 @@ using System.Reflection;
31using System.Xml; 31using System.Xml;
32using log4net; 32using log4net;
33using OpenSim.Region.DataSnapshot.Interfaces; 33using OpenSim.Region.DataSnapshot.Interfaces;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Environment.Modules.World.Land; 36using OpenSim.Region.Environment.Modules.World.Land;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenMetaverse; 38using OpenMetaverse;
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index dd30d8a..22fe067 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using System.Xml; 31using System.Xml;
32using System.IO; 32using System.IO;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.DataSnapshot.Interfaces; 34using OpenSim.Region.DataSnapshot.Interfaces;
35using OpenMetaverse; 35using OpenMetaverse;
36 36
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
index f9f44f0..82325b7 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;
30//using log4net; 30//using log4net;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35 35
36namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction 36namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
37{ 37{
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 7f4bb0b..adfbbad 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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34 34
35namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction 35namespace 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 d98d07d..1eb6795 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;
30using OpenMetaverse; 30using OpenMetaverse;
31using Nini.Config; 31using Nini.Config;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Region.Environment.Scenes;
36 35
37namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction 36namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
38{ 37{
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
index 5387165..e1e1065 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;
33using OpenMetaverse.Packets; 33using OpenMetaverse.Packets;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction 38namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
39{ 39{
diff --git a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
index 76b60fd..861e9f4 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;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Communications.Capabilities; 36using OpenSim.Framework.Communications.Capabilities;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 39using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
40 40
41namespace OpenSim.Region.Environment.Modules.Agent.Capabilities 41namespace OpenSim.Region.Environment.Modules.Agent.Capabilities
@@ -100,7 +100,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Capabilities
100 caps.ItemUpdatedCall = m_scene.CapsUpdateInventoryItemAsset; 100 caps.ItemUpdatedCall = m_scene.CapsUpdateInventoryItemAsset;
101 caps.TaskScriptUpdatedCall = m_scene.CapsUpdateTaskInventoryScriptAsset; 101 caps.TaskScriptUpdatedCall = m_scene.CapsUpdateTaskInventoryScriptAsset;
102 caps.CAPSFetchInventoryDescendents = m_scene.HandleFetchInventoryDescendentsCAPS; 102 caps.CAPSFetchInventoryDescendents = m_scene.HandleFetchInventoryDescendentsCAPS;
103 caps.GetClient = m_scene.m_sceneGraph.GetControllingClient; 103 caps.GetClient = m_scene.SceneContents.GetControllingClient;
104 104
105 m_capsHandlers[agentId] = caps; 105 m_capsHandlers[agentId] = caps;
106 } 106 }
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
index 6bb61e2..4790295 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;
31using OpenMetaverse; 31using OpenMetaverse;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Environment.Interfaces.ITextureSender>; 37using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>;
38 38
39namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload 39namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
40{ 40{
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
index 34ddee6..51aa48e 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;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenMetaverse.Packets; 31using OpenMetaverse.Packets;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34 34
35namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload 35namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
36{ 36{
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
index e0790a2..38d96db 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;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications.Limit; 33using OpenSim.Framework.Communications.Limit;
34using OpenSim.Framework.Statistics; 34using OpenSim.Framework.Statistics;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload 38namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
39{ 39{
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs
index cf76ebc..8524592 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;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenMetaverse.Imaging; 37using OpenMetaverse.Imaging;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.Environment.Modules.Agent.TextureSender 42namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
43{ 43{
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
index f9a10bf..7d7efda 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;
30using OpenMetaverse.Packets; 30using OpenMetaverse.Packets;
31using log4net; 31using log4net;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34 34
35namespace OpenSim.Region.Environment.Modules.Agent.TextureSender 35namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
36{ 36{
diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
index 5b6c2a6..1d18b4b 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;
30using OpenMetaverse; 30using OpenMetaverse;
31using Nini.Config; 31using Nini.Config;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Environment.Modules.Agent.Xfer 36namespace OpenSim.Region.Environment.Modules.Agent.Xfer
37{ 37{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 013301a..1ac0807 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;
35using Nini.Config; 35using Nini.Config;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory 41namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
42{ 42{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
index 8f1ad00..dfa1caa 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;
32using log4net; 32using log4net;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Avatar.Chat 38namespace OpenSim.Region.Environment.Modules.Avatar.Chat
39{ 39{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
index 1109166..f234b75 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;
36using log4net; 36using log4net;
37using Nini.Config; 37using Nini.Config;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.Environment.Modules.Avatar.Chat 42namespace OpenSim.Region.Environment.Modules.Avatar.Chat
43{ 43{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
index 2fafe9b..ccd81c7 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;
33using Nini.Config; 33using Nini.Config;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Environment.Modules.Avatar.Chat 39namespace OpenSim.Region.Environment.Modules.Avatar.Chat
40{ 40{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
index e1c0ac4..c3cafb0 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;
37using log4net; 37using log4net;
38using Nini.Config; 38using Nini.Config;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Framework.Scenes;
42 42
43namespace OpenSim.Region.Environment.Modules.Avatar.Chat 43namespace OpenSim.Region.Environment.Modules.Avatar.Chat
44{ 44{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs
index b5cc3be..78f4265 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;
32using log4net; 32using log4net;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Avatar.Chat 38namespace OpenSim.Region.Environment.Modules.Avatar.Chat
39{ 39{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs
index 6a09f2b..f032319 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;
37using Nini.Config; 37using Nini.Config;
38using Nwc.XmlRpc; 38using Nwc.XmlRpc;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Interfaces; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Environment.Scenes;
43using OpenSim.Framework.Communications.Cache; 42using OpenSim.Framework.Communications.Cache;
44 43
45namespace OpenSim.Region.Environment.Modules.Avatar.Combat.CombatModule 44namespace 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 7cfe2f9..5ac5dbe 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;
41using OpenMetaverse; 41using OpenMetaverse;
42using OpenSim.Framework; 42using OpenSim.Framework;
43using OpenSim.Framework.Servers; 43using OpenSim.Framework.Servers;
44using OpenSim.Region.Environment.Interfaces; 44using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.Environment.Scenes; 45using OpenSim.Region.Framework.Scenes;
46using OpenSim.Region.Environment.Modules.Avatar.Chat; 46using OpenSim.Region.Environment.Modules.Avatar.Chat;
47 47
48namespace OpenSim.Region.Environment.Modules.Avatar.Concierge 48namespace 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 07e62e2..1ec5e9b 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;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Region.Environment.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Interfaces; 43using OpenSim.Region.Framework.Scenes;
44using OpenSim.Region.Environment.Scenes;
45 44
46namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney 45namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
47{ 46{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
index 4f8da9a..d3ac2c0 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;
31using Nini.Config; 31using Nini.Config;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37namespace OpenSim.Region.Environment.Modules.Avatar.Dialog 37namespace OpenSim.Region.Environment.Modules.Avatar.Dialog
38{ 38{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index d54cf27..0ed962e 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;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Region.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Environment.Scenes;
42 41
43namespace OpenSim.Region.Environment.Modules.Avatar.Friends 42namespace OpenSim.Region.Environment.Modules.Avatar.Friends
44{ 43{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
index 5ff6202..969c1d8 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;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.Communications; 32using OpenSim.Framework.Communications;
33using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using System.Reflection; 36using System.Reflection;
37 37
38namespace OpenSim.Region.Environment.Modules.Avatar.Gestures 38namespace 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 dbb645e..e654912 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;
32using log4net; 32using log4net;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Avatar.Groups 38namespace OpenSim.Region.Environment.Modules.Avatar.Groups
39{ 39{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index 747469b..3a1b282 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;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Client; 38using OpenSim.Framework.Client;
39using OpenSim.Region.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Environment.Scenes;
42 41
43namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage 42namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
44{ 43{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
index dec4ca0..347c305 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;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Client; 38using OpenSim.Framework.Client;
39using OpenSim.Region.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Environment.Scenes;
42 41
43namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage 42namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
44{ 43{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs
index a7816b0..c84d3d5 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;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Client; 38using OpenSim.Framework.Client;
39using OpenSim.Region.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Environment.Scenes;
42 41
43namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage 42namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
44{ 43{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index dcfcba3..3a58202 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;
32using System.Reflection; 32using System.Reflection;
33using System.Xml; 33using System.Xml;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Environment.Modules.World.Archiver; 36using OpenSim.Region.Environment.Modules.World.Archiver;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using 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 017ebcc..e23f2a8 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;
32using System.Reflection; 32using System.Reflection;
33using System.Xml; 33using System.Xml;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Environment.Modules.World.Archiver; 36using OpenSim.Region.Environment.Modules.World.Archiver;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using 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 20ea030..62fb3a2 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;
33using log4net; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Environment.Scenes;
39using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
40 39
41namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer 40namespace 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 7bb6843..79d5409 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;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Client; 39using OpenSim.Framework.Client;
40using OpenSim.Region.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Environment.Interfaces; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Environment.Scenes;
43 42
44namespace OpenSim.Region.Environment.Modules.Avatar.Lure 43namespace OpenSim.Region.Environment.Modules.Avatar.Lure
45{ 44{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs
index 56b6d75..c853582 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;
34using OpenMetaverse.StructuredData; 34using OpenMetaverse.StructuredData;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 39using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
40 40
41namespace OpenSim.Region.Environment.Modules.Avatar.ObjectCaps 41namespace OpenSim.Region.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 a9415ce..a7e9849 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;
32using log4net; 32using log4net;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Avatar.Profiles 38namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
39{ 39{
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
index e3a9a45..33d7135 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;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Communications.Capabilities; 37using OpenSim.Framework.Communications.Capabilities;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using Caps=OpenSim.Framework.Communications.Capabilities.Caps; 41using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
42 42
43namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice 43namespace OpenSim.Region.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 bd89175..e4d9b7c 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;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Communications.Capabilities; 36using OpenSim.Framework.Communications.Capabilities;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using Caps=OpenSim.Framework.Communications.Capabilities.Caps; 40using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
41 41
42namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice 42namespace OpenSim.Region.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 62f6df0..cb60d3f 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;
38using Nwc.XmlRpc; 38using Nwc.XmlRpc;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Region.Environment.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.Interfaces; 42using OpenSim.Region.Framework.Scenes;
43using OpenSim.Region.Environment.Scenes;
44 43
45namespace OpenSim.Region.Environment.Modules.Communications.Local 44namespace OpenSim.Region.Environment.Modules.Communications.Local
46{ 45{
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
index b4302fd..cfcd618 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;
42using OpenSim.Framework.Communications; 42using OpenSim.Framework.Communications;
43using OpenSim.Framework.Communications.Cache; 43using OpenSim.Framework.Communications.Cache;
44using OpenSim.Framework.Servers; 44using OpenSim.Framework.Servers;
45using OpenSim.Region.Environment.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Interfaces; 46using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Environment.Scenes; 47using OpenSim.Region.Framework.Scenes.Hypergrid;
48using OpenSim.Region.Environment.Scenes.Hypergrid;
49using OpenSim.Region.Environment.Modules.Communications.Local; 48using OpenSim.Region.Environment.Modules.Communications.Local;
50 49
51namespace OpenSim.Region.Environment.Modules.Communications.REST 50namespace 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 64b48fe..9695fb8 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs
@@ -44,8 +44,8 @@ using OpenMetaverse;
44using Nini.Config; 44using Nini.Config;
45 45
46using OpenSim.Framework; 46using OpenSim.Framework;
47using OpenSim.Region.Environment.Interfaces; 47using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Environment.Scenes; 48using OpenSim.Region.Framework.Scenes;
49using OpenSim.Region.Physics.Manager; 49using OpenSim.Region.Physics.Manager;
50 50
51using log4net; 51using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
index d0015f7..3b1a45e 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
@@ -44,8 +44,8 @@ using OpenMetaverse;
44using Nini.Config; 44using Nini.Config;
45 45
46using OpenSim.Framework; 46using OpenSim.Framework;
47using OpenSim.Region.Environment.Interfaces; 47using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Environment.Scenes; 48using OpenSim.Region.Framework.Scenes;
49using OpenSim.Region.Physics.Manager; 49using OpenSim.Region.Physics.Manager;
50 50
51using log4net; 51using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
index dfca655..5a86d48 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
@@ -43,8 +43,8 @@ using OpenMetaverse;
43 43
44using OpenSim; 44using OpenSim;
45using OpenSim.Framework; 45using OpenSim.Framework;
46using OpenSim.Region.Environment.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.Environment.Scenes; 47using OpenSim.Region.Framework.Scenes;
48using OpenSim.Region.Physics.Manager; 48using OpenSim.Region.Physics.Manager;
49 49
50using log4net; 50using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
index c1f8a8a..cfd5cde 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
@@ -46,8 +46,8 @@ using Nini.Config;
46 46
47using OpenSim; 47using OpenSim;
48using OpenSim.Framework; 48using OpenSim.Framework;
49using OpenSim.Region.Environment.Interfaces; 49using OpenSim.Region.Framework.Interfaces;
50using OpenSim.Region.Environment.Scenes; 50using OpenSim.Region.Framework.Scenes;
51using OpenSim.Region.Physics.Manager; 51using OpenSim.Region.Physics.Manager;
52 52
53using log4net; 53using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
index 02e77bb..6399608 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
@@ -43,8 +43,8 @@ using OpenMetaverse;
43 43
44using OpenSim; 44using OpenSim;
45using OpenSim.Framework; 45using OpenSim.Framework;
46using OpenSim.Region.Environment.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.Environment.Scenes; 47using OpenSim.Region.Framework.Scenes;
48using OpenSim.Region.Physics.Manager; 48using OpenSim.Region.Physics.Manager;
49 49
50using log4net; 50using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs
index 88f4a67..e5c9bb3 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs
@@ -43,8 +43,8 @@ using OpenMetaverse;
43 43
44using OpenSim; 44using OpenSim;
45using OpenSim.Framework; 45using OpenSim.Framework;
46using OpenSim.Region.Environment.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.Environment.Scenes; 47using OpenSim.Region.Framework.Scenes;
48using OpenSim.Region.Physics.Manager; 48using OpenSim.Region.Physics.Manager;
49 49
50using log4net; 50using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
index d0b5929..2ea5ebc 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
@@ -43,8 +43,8 @@ using OpenMetaverse;
43using Nini.Config; 43using Nini.Config;
44 44
45using OpenSim.Framework; 45using OpenSim.Framework;
46using OpenSim.Region.Environment.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.Environment.Scenes; 47using OpenSim.Region.Framework.Scenes;
48using OpenSim.Region.Physics.Manager; 48using OpenSim.Region.Physics.Manager;
49 49
50using log4net; 50using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
index f52c3b8..417cbce 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
@@ -42,8 +42,8 @@ using Nini.Config;
42 42
43using OpenSim; 43using OpenSim;
44using OpenSim.Framework; 44using OpenSim.Framework;
45using OpenSim.Region.Environment.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Environment.Scenes; 46using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Physics.Manager; 47using OpenSim.Region.Physics.Manager;
48 48
49using log4net; 49using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
index 3a8e374..65db153 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
@@ -45,10 +45,10 @@ using OpenMetaverse;
45using Nini.Config; 45using Nini.Config;
46 46
47using OpenSim.Framework; 47using OpenSim.Framework;
48using OpenSim.Region.Environment.Interfaces; 48using OpenSim.Region.Framework.Interfaces;
49using OpenSim.Region.Framework.Scenes;
49using OpenSim.Region.Environment.Modules.World.Serialiser; 50using OpenSim.Region.Environment.Modules.World.Serialiser;
50using OpenSim.Region.Environment.Modules.World.Terrain; 51using OpenSim.Region.Environment.Modules.World.Terrain;
51using OpenSim.Region.Environment.Scenes;
52using OpenSim.Region.Physics.Manager; 52using OpenSim.Region.Physics.Manager;
53 53
54using log4net; 54using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs
index 9fd542c..4209dab 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs
@@ -46,10 +46,10 @@ using OpenMetaverse;
46using Nini.Config; 46using Nini.Config;
47 47
48using OpenSim.Framework; 48using OpenSim.Framework;
49using OpenSim.Region.Environment.Interfaces; 49using OpenSim.Region.Framework.Interfaces;
50using OpenSim.Region.Framework.Scenes;
50using OpenSim.Region.Environment.Modules.World.Serialiser; 51using OpenSim.Region.Environment.Modules.World.Serialiser;
51using OpenSim.Region.Environment.Modules.World.Terrain; 52using OpenSim.Region.Environment.Modules.World.Terrain;
52using OpenSim.Region.Environment.Scenes;
53using OpenSim.Region.Physics.Manager; 53using OpenSim.Region.Physics.Manager;
54 54
55using log4net; 55using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs
index 638172b..79dc86e 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs
@@ -37,7 +37,7 @@
37 37
38using System; 38using System;
39using OpenMetaverse; 39using OpenMetaverse;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using Nini.Config; 41using Nini.Config;
42 42
43namespace OpenSim.Region.Environment.Modules.ContentManagement 43namespace OpenSim.Region.Environment.Modules.ContentManagement
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
index d654a1a..c8f8c2f 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
@@ -44,8 +44,8 @@ using OpenMetaverse;
44using Nini.Config; 44using Nini.Config;
45 45
46using OpenSim.Framework; 46using OpenSim.Framework;
47using OpenSim.Region.Environment.Interfaces; 47using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Environment.Scenes; 48using OpenSim.Region.Framework.Scenes;
49using OpenSim.Region.Physics.Manager; 49using OpenSim.Region.Physics.Manager;
50 50
51using log4net; 51using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs
index 5db9545..d6ba92f 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs
@@ -44,8 +44,8 @@ using OpenMetaverse;
44using Nini.Config; 44using Nini.Config;
45 45
46using OpenSim.Framework; 46using OpenSim.Framework;
47using OpenSim.Region.Environment.Interfaces; 47using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Environment.Scenes; 48using OpenSim.Region.Framework.Scenes;
49using OpenSim.Region.Physics.Manager; 49using OpenSim.Region.Physics.Manager;
50 50
51using log4net; 51using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
index 79e970d..225a682 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
@@ -42,8 +42,8 @@ using OpenMetaverse;
42using Nini.Config; 42using Nini.Config;
43 43
44using OpenSim.Framework; 44using OpenSim.Framework;
45using OpenSim.Region.Environment.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Environment.Scenes; 46using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Physics.Manager; 47using OpenSim.Region.Physics.Manager;
48 48
49using log4net; 49using log4net;
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
index bc4c5b9..fb30321 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;
34using System.Threading; 34using System.Threading;
35using System.Xml; 35using System.Xml;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenMetaverse.Packets;
37using OpenMetaverse.StructuredData; 38using OpenMetaverse.StructuredData;
38using log4net; 39using log4net;
39using Nini.Config; 40using Nini.Config;
@@ -42,9 +43,8 @@ using OpenSim.Framework;
42using OpenSim.Framework.Communications.Cache; 43using OpenSim.Framework.Communications.Cache;
43using OpenSim.Framework.Communications.Capabilities; 44using OpenSim.Framework.Communications.Capabilities;
44using OpenSim.Framework.Servers; 45using OpenSim.Framework.Servers;
45using OpenSim.Region.Environment.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Interfaces; 47using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Environment.Scenes;
48 48
49using OSD = OpenMetaverse.StructuredData.OSD; 49using OSD = OpenMetaverse.StructuredData.OSD;
50using OSDMap = OpenMetaverse.StructuredData.OSDMap; 50using OSDMap = OpenMetaverse.StructuredData.OSDMap;
@@ -555,5 +555,76 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
555 555
556 return new OSDString("shutdown404!"); 556 return new OSDString("shutdown404!");
557 } 557 }
558
559 public void DisableSimulator(ulong handle, UUID avatarID)
560 {
561 OSD item = EventQueueHelper.DisableSimulator(handle);
562 Enqueue(item, avatarID);
563 }
564
565 public void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID)
566 {
567 OSD item = EventQueueHelper.EnableSimulator(handle, endPoint);
568 Enqueue(item, avatarID);
569 }
570
571 public void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath)
572 {
573 OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath);
574 Enqueue(item, avatarID);
575 }
576
577 public void TeleportFinishEvent(ulong regionHandle, byte simAccess,
578 IPEndPoint regionExternalEndPoint,
579 uint locationID, uint flags, string capsURL,
580 UUID avatarID)
581 {
582 OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint,
583 locationID, flags, capsURL, avatarID);
584 Enqueue(item, avatarID);
585 }
586
587 public void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
588 IPEndPoint newRegionExternalEndPoint,
589 string capsURL, UUID avatarID, UUID sessionID)
590 {
591 OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint,
592 capsURL, avatarID, sessionID);
593 Enqueue(item, avatarID);
594 }
595
596 public void ChatterboxInvitation(UUID sessionID, string sessionName,
597 UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
598 uint timeStamp, bool offline, int parentEstateID, Vector3 position,
599 uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket)
600 {
601 OSD item = EventQueueHelper.ChatterboxInvitation(sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog,
602 timeStamp, offline, parentEstateID, position, ttl, transactionID,
603 fromGroup, binaryBucket);
604 Enqueue(item, toAgent);
605 m_log.InfoFormat("########### eq ChatterboxInvitation #############\n{0}", item);
606
607 }
608
609 public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat,
610 bool isModerator, bool textMute)
611 {
612 OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat,
613 isModerator, textMute);
614 Enqueue(item, toAgent);
615 m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item);
616 }
617
618 public void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID)
619 {
620 OSD item = Environment.EventQueueHelper.ParcelProperties(parcelPropertiesPacket);
621 Enqueue(item, avatarID);
622 }
623
624 public void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID)
625 {
626 OSD item = EventQueueHelper.GroupMembership(groupUpdate);
627 Enqueue(item, avatarID);
628 }
558 } 629 }
559} 630}
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs
index 546d9d1..b38ddba 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
71 return llsdEvent; 71 return llsdEvent;
72 } 72 }
73 73
74 public static OSD EnableSimulator(ulong Handle, IPEndPoint endPoint) 74 public static OSD EnableSimulator(ulong handle, IPEndPoint endPoint)
75 { 75 {
76 OSDMap llsdSimInfo = new OSDMap(3); 76 OSDMap llsdSimInfo = new OSDMap(3);
77 77
78 llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(Handle))); 78 llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle)));
79 llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes())); 79 llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes()));
80 llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port)); 80 llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port));
81 81
@@ -88,11 +88,11 @@ namespace OpenSim.Region.Environment
88 return buildEvent("EnableSimulator", llsdBody); 88 return buildEvent("EnableSimulator", llsdBody);
89 } 89 }
90 90
91 public static OSD DisableSimulator(ulong Handle) 91 public static OSD DisableSimulator(ulong handle)
92 { 92 {
93 //OSDMap llsdSimInfo = new OSDMap(1); 93 //OSDMap llsdSimInfo = new OSDMap(1);
94 94
95 //llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(Handle))); 95 //llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(handle)));
96 96
97 //OSDArray arr = new OSDArray(1); 97 //OSDArray arr = new OSDArray(1);
98 //arr.Add(llsdSimInfo); 98 //arr.Add(llsdSimInfo);
@@ -103,57 +103,57 @@ namespace OpenSim.Region.Environment
103 return buildEvent("DisableSimulator", llsdBody); 103 return buildEvent("DisableSimulator", llsdBody);
104 } 104 }
105 105
106 public static OSD CrossRegion(ulong Handle, Vector3 pos, Vector3 lookAt, 106 public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
107 IPEndPoint newRegionExternalEndPoint, 107 IPEndPoint newRegionExternalEndPoint,
108 string capsURL, UUID AgentID, UUID SessionID) 108 string capsURL, UUID agentID, UUID sessionID)
109 { 109 {
110 OSDArray LookAtArr = new OSDArray(3); 110 OSDArray lookAtArr = new OSDArray(3);
111 LookAtArr.Add(OSD.FromReal(lookAt.X)); 111 lookAtArr.Add(OSD.FromReal(lookAt.X));
112 LookAtArr.Add(OSD.FromReal(lookAt.Y)); 112 lookAtArr.Add(OSD.FromReal(lookAt.Y));
113 LookAtArr.Add(OSD.FromReal(lookAt.Z)); 113 lookAtArr.Add(OSD.FromReal(lookAt.Z));
114 114
115 OSDArray PositionArr = new OSDArray(3); 115 OSDArray positionArr = new OSDArray(3);
116 PositionArr.Add(OSD.FromReal(pos.X)); 116 positionArr.Add(OSD.FromReal(pos.X));
117 PositionArr.Add(OSD.FromReal(pos.Y)); 117 positionArr.Add(OSD.FromReal(pos.Y));
118 PositionArr.Add(OSD.FromReal(pos.Z)); 118 positionArr.Add(OSD.FromReal(pos.Z));
119 119
120 OSDMap InfoMap = new OSDMap(2); 120 OSDMap infoMap = new OSDMap(2);
121 InfoMap.Add("LookAt", LookAtArr); 121 infoMap.Add("LookAt", lookAtArr);
122 InfoMap.Add("Position", PositionArr); 122 infoMap.Add("Position", positionArr);
123 123
124 OSDArray InfoArr = new OSDArray(1); 124 OSDArray infoArr = new OSDArray(1);
125 InfoArr.Add(InfoMap); 125 infoArr.Add(infoMap);
126 126
127 OSDMap AgentDataMap = new OSDMap(2); 127 OSDMap agentDataMap = new OSDMap(2);
128 AgentDataMap.Add("AgentID", OSD.FromUUID(AgentID)); 128 agentDataMap.Add("AgentID", OSD.FromUUID(agentID));
129 AgentDataMap.Add("SessionID", OSD.FromUUID(SessionID)); 129 agentDataMap.Add("SessionID", OSD.FromUUID(sessionID));
130 130
131 OSDArray AgentDataArr = new OSDArray(1); 131 OSDArray agentDataArr = new OSDArray(1);
132 AgentDataArr.Add(AgentDataMap); 132 agentDataArr.Add(agentDataMap);
133 133
134 OSDMap RegionDataMap = new OSDMap(4); 134 OSDMap regionDataMap = new OSDMap(4);
135 RegionDataMap.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(Handle))); 135 regionDataMap.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(handle)));
136 RegionDataMap.Add("SeedCapability", OSD.FromString(capsURL)); 136 regionDataMap.Add("SeedCapability", OSD.FromString(capsURL));
137 RegionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes())); 137 regionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes()));
138 RegionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port)); 138 regionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port));
139 139
140 OSDArray RegionDataArr = new OSDArray(1); 140 OSDArray regionDataArr = new OSDArray(1);
141 RegionDataArr.Add(RegionDataMap); 141 regionDataArr.Add(regionDataMap);
142 142
143 OSDMap llsdBody = new OSDMap(3); 143 OSDMap llsdBody = new OSDMap(3);
144 llsdBody.Add("Info", InfoArr); 144 llsdBody.Add("Info", infoArr);
145 llsdBody.Add("AgentData", AgentDataArr); 145 llsdBody.Add("AgentData", agentDataArr);
146 llsdBody.Add("RegionData", RegionDataArr); 146 llsdBody.Add("RegionData", regionDataArr);
147 147
148 return buildEvent("CrossedRegion", llsdBody); 148 return buildEvent("CrossedRegion", llsdBody);
149 } 149 }
150 150
151 public static OSD TeleportFinishEvent( 151 public static OSD TeleportFinishEvent(
152 ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, 152 ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
153 uint locationID, uint flags, string capsURL, UUID AgentID) 153 uint locationID, uint flags, string capsURL, UUID agentID)
154 { 154 {
155 OSDMap info = new OSDMap(); 155 OSDMap info = new OSDMap();
156 info.Add("AgentID", OSD.FromUUID(AgentID)); 156 info.Add("AgentID", OSD.FromUUID(agentID));
157 info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this? 157 info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this?
158 info.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(regionHandle))); 158 info.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(regionHandle)));
159 info.Add("SeedCapability", OSD.FromString(capsURL)); 159 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 6642bdc..0ad95ae 100644
--- a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Region.Environment.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31 31
32namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander 32namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander
33{ 33{
diff --git a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs
index 1da1177..31a67f7 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;
31using System.Text; 31using System.Text;
32using log4net; 32using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35 35
36namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander 36namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander
37{ 37{
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
index b0d44d7..edf1231 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using OpenSim.Framework; 28using OpenSim.Framework;
29using OpenSim.Region.Environment.Scenes; 29using OpenSim.Region.Framework.Scenes;
30 30
31namespace OpenSim.Region.Environment.Modules.Grid.Interregion 31namespace OpenSim.Region.Environment.Modules.Grid.Interregion
32{ 32{
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
index acd0e5c..cb571e4 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;
32using System.Runtime.Remoting.Channels.Tcp; 32using System.Runtime.Remoting.Channels.Tcp;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Grid.Interregion 38namespace OpenSim.Region.Environment.Modules.Grid.Interregion
39{ 39{
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
index 285a019..4cb1c20 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
@@ -40,8 +40,8 @@ using OpenSim.Framework;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.Region.Environment.Interfaces; 43using OpenSim.Region.Framework.Interfaces;
44using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Framework.Scenes;
45using OpenSim.Grid.AssetServer; 45using OpenSim.Grid.AssetServer;
46using OpenSim.Data; 46using OpenSim.Data;
47 47
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
index b10582b..54ba761 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
+++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
@@ -37,8 +37,8 @@ using OpenSim.Framework;
37using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
39using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Framework.Scenes;
42 42
43namespace OpenSim.Region.Environment.Modules.Hypergrid 43namespace OpenSim.Region.Environment.Modules.Hypergrid
44{ 44{
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs
index e642b7f..1d9182e 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs
@@ -47,10 +47,10 @@ using OpenSim.Framework;
47using OpenSim.Framework.Communications.Cache; 47using OpenSim.Framework.Communications.Cache;
48using OpenSim.Framework.Communications.Capabilities; 48using OpenSim.Framework.Communications.Capabilities;
49using OpenSim.Framework.Servers; 49using OpenSim.Framework.Servers;
50using OpenSim.Region.Environment.Interfaces; 50using OpenSim.Region.Framework.Interfaces;
51using OpenSim.Region.Framework.Scenes;
52using OpenSim.Region.Framework.Scenes.Types;
51using OpenSim.Region.Environment.Modules.World.WorldMap; 53using OpenSim.Region.Environment.Modules.World.WorldMap;
52using OpenSim.Region.Environment.Scenes;
53using OpenSim.Region.Environment.Types;
54using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 54using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
55 55
56using OSD = OpenMetaverse.StructuredData.OSD; 56using OSD = OpenMetaverse.StructuredData.OSD;
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index f5b2823..12a76de8 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -44,8 +44,8 @@ using Nini.Config;
44using OpenSim.Framework; 44using OpenSim.Framework;
45using OpenSim.Framework.Communications.Capabilities; 45using OpenSim.Framework.Communications.Capabilities;
46using OpenSim.Framework.Servers; 46using OpenSim.Framework.Servers;
47using OpenSim.Region.Environment.Interfaces; 47using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Environment.Scenes; 48using OpenSim.Region.Framework.Scenes;
49 49
50using OSD = OpenMetaverse.StructuredData.OSD; 50using OSD = OpenMetaverse.StructuredData.OSD;
51using OSDMap = OpenMetaverse.StructuredData.OSDMap; 51using 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 bddf10d..f498f9a 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;
33using OpenMetaverse.Imaging; 33using OpenMetaverse.Imaging;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture 39namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
40{ 40{
diff --git a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs
index 5a715f5..81ce761 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;
31using System.Text.RegularExpressions; 31using System.Text.RegularExpressions;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using log4net; 36using log4net;
37using Nini.Config; 37using Nini.Config;
38using DotNetOpenMail; 38using DotNetOpenMail;
diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index eb9b322..821c60e 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;
35using Nini.Config; 35using Nini.Config;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using System.Collections; 40using System.Collections;
41 41
42/***************************************************** 42/*****************************************************
@@ -84,14 +84,14 @@ using System.Collections;
84 84
85namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest 85namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
86{ 86{
87 public class HttpRequestModule : IRegionModule, IHttpRequests 87 public class HttpRequestModule : IRegionModule, IHttpRequestModule
88 { 88 {
89 private object HttpListLock = new object(); 89 private object HttpListLock = new object();
90 private int httpTimeout = 30000; 90 private int httpTimeout = 30000;
91 private string m_name = "HttpScriptRequests"; 91 private string m_name = "HttpScriptRequests";
92 92
93 private string m_proxyurl = ""; 93 private string m_proxyurl = "";
94 private string m_proxyexcepts = ""; 94 private string m_proxyexcepts = "";
95 95
96 // <request id, HttpRequestClass> 96 // <request id, HttpRequestClass>
97 private Dictionary<UUID, HttpRequestClass> m_pendingRequests; 97 private Dictionary<UUID, HttpRequestClass> m_pendingRequests;
@@ -102,7 +102,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
102 { 102 {
103 } 103 }
104 104
105 #region IHttpRequests Members 105 #region IHttpRequestModule Members
106 106
107 public UUID MakeHttpRequest(string url, string parameters, string body) 107 public UUID MakeHttpRequest(string url, string parameters, string body)
108 { 108 {
@@ -125,22 +125,22 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
125 { 125 {
126 switch (Int32.Parse(parms[i])) 126 switch (Int32.Parse(parms[i]))
127 { 127 {
128 case HttpRequestClass.HTTP_METHOD: 128 case (int)HttpRequestConstants.HTTP_METHOD:
129 129
130 htc.httpMethod = parms[i + 1]; 130 htc.HttpMethod = parms[i + 1];
131 break; 131 break;
132 132
133 case HttpRequestClass.HTTP_MIMETYPE: 133 case (int)HttpRequestConstants.HTTP_MIMETYPE:
134 134
135 htc.httpMIMEType = parms[i + 1]; 135 htc.HttpMIMEType = parms[i + 1];
136 break; 136 break;
137 137
138 case HttpRequestClass.HTTP_BODY_MAXLENGTH: 138 case (int)HttpRequestConstants.HTTP_BODY_MAXLENGTH:
139 139
140 // TODO implement me 140 // TODO implement me
141 break; 141 break;
142 142
143 case HttpRequestClass.HTTP_VERIFY_CERT: 143 case (int)HttpRequestConstants.HTTP_VERIFY_CERT:
144 144
145 // TODO implement me 145 // TODO implement me
146 break; 146 break;
@@ -148,22 +148,22 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
148 } 148 }
149 } 149 }
150 150
151 htc.localID = localID; 151 htc.LocalID = localID;
152 htc.itemID = itemID; 152 htc.ItemID = itemID;
153 htc.url = url; 153 htc.Url = url;
154 htc.reqID = reqID; 154 htc.ReqID = reqID;
155 htc.httpTimeout = httpTimeout; 155 htc.HttpTimeout = httpTimeout;
156 htc.outbound_body = body; 156 htc.OutboundBody = body;
157 htc.response_headers = headers; 157 htc.ResponseHeaders = headers;
158 htc.proxyurl = m_proxyurl; 158 htc.proxyurl = m_proxyurl;
159 htc.proxyexcepts = m_proxyexcepts; 159 htc.proxyexcepts = m_proxyexcepts;
160 160
161 lock (HttpListLock) 161 lock (HttpListLock)
162 { 162 {
163 m_pendingRequests.Add(reqID, htc); 163 m_pendingRequests.Add(reqID, htc);
164 } 164 }
165 165
166 htc.process(); 166 htc.Process();
167 167
168 return reqID; 168 return reqID;
169 } 169 }
@@ -193,7 +193,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
193 * it will need some refactoring and this works 'enough' right now 193 * it will need some refactoring and this works 'enough' right now
194 */ 194 */
195 195
196 public HttpRequestClass GetNextCompletedRequest() 196 public IServiceRequest GetNextCompletedRequest()
197 { 197 {
198 lock (HttpListLock) 198 lock (HttpListLock)
199 { 199 {
@@ -203,7 +203,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
203 203
204 if (m_pendingRequests.TryGetValue(luid, out tmpReq)) 204 if (m_pendingRequests.TryGetValue(luid, out tmpReq))
205 { 205 {
206 if (tmpReq.finished) 206 if (tmpReq.Finished)
207 { 207 {
208 return tmpReq; 208 return tmpReq;
209 } 209 }
@@ -235,10 +235,10 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
235 { 235 {
236 m_scene = scene; 236 m_scene = scene;
237 237
238 m_scene.RegisterModuleInterface<IHttpRequests>(this); 238 m_scene.RegisterModuleInterface<IHttpRequestModule>(this);
239 239
240 m_proxyurl = config.Configs["Startup"].GetString("HttpProxy"); 240 m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
241 m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions"); 241 m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
242 242
243 m_pendingRequests = new Dictionary<UUID, HttpRequestClass>(); 243 m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
244 } 244 }
@@ -264,45 +264,64 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
264 #endregion 264 #endregion
265 } 265 }
266 266
267 public class HttpRequestClass 267 public class HttpRequestClass: IServiceRequest
268 { 268 {
269 // Constants for parameters 269 // Constants for parameters
270 public const int HTTP_BODY_MAXLENGTH = 2; 270 // public const int HTTP_BODY_MAXLENGTH = 2;
271 public const int HTTP_METHOD = 0; 271 // public const int HTTP_METHOD = 0;
272 public const int HTTP_MIMETYPE = 1; 272 // public const int HTTP_MIMETYPE = 1;
273 public const int HTTP_VERIFY_CERT = 3; 273 // public const int HTTP_VERIFY_CERT = 3;
274 public bool finished; 274 private bool _finished;
275 public int httpBodyMaxLen = 2048; // not implemented 275 public bool Finished
276 {
277 get { return _finished; }
278 }
279 // public int HttpBodyMaxLen = 2048; // not implemented
276 280
277 // Parameter members and default values 281 // Parameter members and default values
278 public string httpMethod = "GET"; 282 public string HttpMethod = "GET";
279 public string httpMIMEType = "text/plain;charset=utf-8"; 283 public string HttpMIMEType = "text/plain;charset=utf-8";
284 public int HttpTimeout;
285 // public bool HttpVerifyCert = true; // not implemented
280 private Thread httpThread; 286 private Thread httpThread;
281 public int httpTimeout;
282 public bool httpVerifyCert = true; // not implemented
283 287
284 // Request info 288 // Request info
285 public UUID itemID; 289 private UUID _itemID;
286 public uint localID; 290 public UUID ItemID
287 public DateTime next; 291 {
288 public string outbound_body; 292 get { return _itemID; }
289 public UUID reqID; 293 set { _itemID = value; }
290 public HttpWebRequest request; 294 }
291 public string response_body; 295 private uint _localID;
292 public List<string> response_metadata; 296 public uint LocalID
293 public Dictionary<string, string> response_headers; 297 {
294 public int status; 298 get { return _localID; }
295 public string url; 299 set { _localID = value; }
300 }
301 public DateTime Next;
296 public string proxyurl; 302 public string proxyurl;
297 public string proxyexcepts; 303 public string proxyexcepts;
298 304 public string OutboundBody;
299 public void process() 305 private UUID _reqID;
306 public UUID ReqID
307 {
308 get { return _reqID; }
309 set { _reqID = value; }
310 }
311 public HttpWebRequest Request;
312 public string ResponseBody;
313 public List<string> ResponseMetadata;
314 public Dictionary<string, string> ResponseHeaders;
315 public int Status;
316 public string Url;
317
318 public void Process()
300 { 319 {
301 httpThread = new Thread(SendRequest); 320 httpThread = new Thread(SendRequest);
302 httpThread.Name = "HttpRequestThread"; 321 httpThread.Name = "HttpRequestThread";
303 httpThread.Priority = ThreadPriority.BelowNormal; 322 httpThread.Priority = ThreadPriority.BelowNormal;
304 httpThread.IsBackground = true; 323 httpThread.IsBackground = true;
305 finished = false; 324 _finished = false;
306 httpThread.Start(); 325 httpThread.Start();
307 ThreadTracker.Add(httpThread); 326 ThreadTracker.Add(httpThread);
308 } 327 }
@@ -322,37 +341,35 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
322 341
323 try 342 try
324 { 343 {
325 request = (HttpWebRequest) 344 Request = (HttpWebRequest) WebRequest.Create(Url);
326 WebRequest.Create(url); 345 Request.Method = HttpMethod;
327 request.Method = httpMethod; 346 Request.ContentType = HttpMIMEType;
328 request.ContentType = httpMIMEType; 347 if (proxyurl.Length > 0)
329 if (proxyurl.Length > 0) 348 {
330 { 349 if (proxyexcepts.Length > 0) {
331 if (proxyexcepts.Length > 0) { 350 string[] elist = proxyexcepts.Split(';');
332 string[] elist = proxyexcepts.Split(';'); 351 Request.Proxy = new WebProxy(proxyurl,true,elist);
333 request.Proxy = new WebProxy(proxyurl,true,elist); 352 } else {
334 } else { 353 Request.Proxy = new WebProxy(proxyurl,true);
335 request.Proxy = new WebProxy(proxyurl,true); 354 }
336 } 355 }
337 } 356
338 357 foreach (KeyValuePair<string, string> entry in ResponseHeaders)
339 foreach (KeyValuePair<string, string> entry in response_headers) 358 Request.Headers[entry.Key] = entry.Value;
340 request.Headers[entry.Key] = entry.Value;
341 359
342 // Encode outbound data 360 // Encode outbound data
343 if (outbound_body.Length > 0) { 361 if (OutboundBody.Length > 0) {
344 byte[] data = Encoding.UTF8.GetBytes(outbound_body); 362 byte[] data = Encoding.UTF8.GetBytes(OutboundBody);
345 363
346 request.ContentLength = data.Length; 364 Request.ContentLength = data.Length;
347 Stream bstream = request.GetRequestStream(); 365 Stream bstream = Request.GetRequestStream();
348 bstream.Write(data, 0, data.Length); 366 bstream.Write(data, 0, data.Length);
349 bstream.Close(); 367 bstream.Close();
350 } 368 }
351 369
352 request.Timeout = httpTimeout; 370 Request.Timeout = HttpTimeout;
353 // execute the request 371 // execute the request
354 response = (HttpWebResponse) 372 response = (HttpWebResponse) Request.GetResponse();
355 request.GetResponse();
356 373
357 Stream resStream = response.GetResponseStream(); 374 Stream resStream = response.GetResponseStream();
358 375
@@ -372,23 +389,23 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
372 } 389 }
373 } while (count > 0); // any more data to read? 390 } while (count > 0); // any more data to read?
374 391
375 response_body = sb.ToString(); 392 ResponseBody = sb.ToString();
376 } 393 }
377 catch (Exception e) 394 catch (Exception e)
378 { 395 {
379 if (e is WebException && ((WebException)e).Status == WebExceptionStatus.ProtocolError) 396 if (e is WebException && ((WebException)e).Status == WebExceptionStatus.ProtocolError)
380 { 397 {
381 HttpWebResponse webRsp = (HttpWebResponse)((WebException)e).Response; 398 HttpWebResponse webRsp = (HttpWebResponse)((WebException)e).Response;
382 status = (int)webRsp.StatusCode; 399 Status = (int)webRsp.StatusCode;
383 response_body = webRsp.StatusDescription; 400 ResponseBody = webRsp.StatusDescription;
384 } 401 }
385 else 402 else
386 { 403 {
387 status = (int)OSHttpStatusCode.ClientErrorJoker; 404 Status = (int)OSHttpStatusCode.ClientErrorJoker;
388 response_body = e.Message; 405 ResponseBody = e.Message;
389 } 406 }
390 407
391 finished = true; 408 _finished = true;
392 return; 409 return;
393 } 410 }
394 finally 411 finally
@@ -397,8 +414,8 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
397 response.Close(); 414 response.Close();
398 } 415 }
399 416
400 status = (int)OSHttpStatusCode.SuccessOk; 417 Status = (int)OSHttpStatusCode.SuccessOk;
401 finished = true; 418 _finished = true;
402 } 419 }
403 420
404 public void Stop() 421 public void Stop()
diff --git a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 3d0afd1..af78c36 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;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenMetaverse.Imaging; 33using OpenMetaverse.Imaging;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL 38namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL
39{ 39{
diff --git a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
index 3b318a4..60806a7 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;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenMetaverse.Imaging; 35using OpenMetaverse.Imaging;
36using Nini.Config; 36using Nini.Config;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Framework.Scenes;
39 39
40//using Cairo; 40//using Cairo;
41 41
diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
index 99e3177..258734d 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;
31using OpenMetaverse; 31using OpenMetaverse;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37// using log4net; 37// using log4net;
38// using System.Reflection; 38// using System.Reflection;
@@ -313,7 +313,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
313 /// Pop the first availlable listen event from the queue 313 /// Pop the first availlable listen event from the queue
314 /// </summary> 314 /// </summary>
315 /// <returns>ListenerInfo with filter filled in</returns> 315 /// <returns>ListenerInfo with filter filled in</returns>
316 public ListenerInfo GetNextMessage() 316 public IWorldCommListenerInfo GetNextMessage()
317 { 317 {
318 ListenerInfo li = null; 318 ListenerInfo li = null;
319 319
@@ -608,7 +608,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
608 } 608 }
609 } 609 }
610 610
611 public class ListenerInfo 611 public class ListenerInfo: IWorldCommListenerInfo
612 { 612 {
613 private bool m_active; // Listener is active or not 613 private bool m_active; // Listener is active or not
614 private int m_handle; // Assigned handle of this listener 614 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 28028bc..fb86731 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;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Framework.Scenes;
42 42
43/***************************************************** 43/*****************************************************
44 * 44 *
@@ -302,7 +302,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
302 } 302 }
303 } 303 }
304 304
305 public RPCRequestInfo GetNextCompletedRequest() 305 public IXmlRpcRequestInfo GetNextCompletedRequest()
306 { 306 {
307 if (m_rpcPending != null) 307 if (m_rpcPending != null)
308 { 308 {
@@ -345,10 +345,11 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
345 localID, itemID, channel, dest, idata, sdata 345 localID, itemID, channel, dest, idata, sdata
346 ); 346 );
347 m_pendingSRDResponses.Add(req.GetReqID(), req); 347 m_pendingSRDResponses.Add(req.GetReqID(), req);
348 return req.process(); 348 req.Process();
349 return req.ReqID;
349 } 350 }
350 351
351 public SendRemoteDataRequest GetNextCompletedSRDRequest() 352 public IServiceRequest GetNextCompletedSRDRequest()
352 { 353 {
353 if (m_pendingSRDResponses != null) 354 if (m_pendingSRDResponses != null)
354 { 355 {
@@ -360,7 +361,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
360 361
361 if (m_pendingSRDResponses.TryGetValue(luid, out tmpReq)) 362 if (m_pendingSRDResponses.TryGetValue(luid, out tmpReq))
362 { 363 {
363 if (tmpReq.finished) 364 if (tmpReq.Finished)
364 return tmpReq; 365 return tmpReq;
365 } 366 }
366 } 367 }
@@ -389,7 +390,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
389 { 390 {
390 foreach (SendRemoteDataRequest li in m_pendingSRDResponses.Values) 391 foreach (SendRemoteDataRequest li in m_pendingSRDResponses.Values)
391 { 392 {
392 if (li.m_itemID.Equals(itemID)) 393 if (li.ItemID.Equals(itemID))
393 m_pendingSRDResponses.Remove(li.GetReqID()); 394 m_pendingSRDResponses.Remove(li.GetReqID());
394 } 395 }
395 } 396 }
@@ -460,7 +461,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
460 } 461 }
461 } 462 }
462 463
463 public class RPCRequestInfo 464 public class RPCRequestInfo: IXmlRpcRequestInfo
464 { 465 {
465 private UUID m_ChannelKey; 466 private UUID m_ChannelKey;
466 private string m_IntVal; 467 private string m_IntVal;
@@ -575,45 +576,64 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
575 } 576 }
576 } 577 }
577 578
578 public class SendRemoteDataRequest 579 public class SendRemoteDataRequest: IServiceRequest
579 { 580 {
580 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 581 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
581 public string channel; 582
582 public string destURL; 583 public string Channel;
583 public bool finished; 584 public string DestURL;
585 private bool _finished;
586 public bool Finished
587 {
588 get { return _finished; }
589 set { _finished = value; }
590 }
584 private Thread httpThread; 591 private Thread httpThread;
585 public int idata; 592 public int Idata;
586 public UUID m_itemID; 593 private UUID _itemID;
587 public uint m_localID; 594 public UUID ItemID
588 public UUID reqID; 595 {
589 public XmlRpcRequest request; 596 get { return _itemID; }
590 public int response_idata; 597 set { _itemID = value; }
591 public string response_sdata; 598 }
592 public string sdata; 599 private uint _localID;
600 public uint LocalID
601 {
602 get { return _localID; }
603 set { _localID = value; }
604 }
605 private UUID _reqID;
606 public UUID ReqID
607 {
608 get { return _reqID; }
609 set { _reqID = value; }
610 }
611 public XmlRpcRequest Request;
612 public int ResponseIdata;
613 public string ResponseSdata;
614 public string Sdata;
593 615
594 public SendRemoteDataRequest(uint localID, UUID itemID, string channel, string dest, int idata, string sdata) 616 public SendRemoteDataRequest(uint localID, UUID itemID, string channel, string dest, int idata, string sdata)
595 { 617 {
596 this.channel = channel; 618 this.Channel = channel;
597 destURL = dest; 619 DestURL = dest;
598 this.idata = idata; 620 this.Idata = idata;
599 this.sdata = sdata; 621 this.Sdata = sdata;
600 m_itemID = itemID; 622 ItemID = itemID;
601 m_localID = localID; 623 LocalID = localID;
602 624
603 reqID = UUID.Random(); 625 ReqID = UUID.Random();
604 } 626 }
605 627
606 public UUID process() 628 public void Process()
607 { 629 {
608 httpThread = new Thread(SendRequest); 630 httpThread = new Thread(SendRequest);
609 httpThread.Name = "HttpRequestThread"; 631 httpThread.Name = "HttpRequestThread";
610 httpThread.Priority = ThreadPriority.BelowNormal; 632 httpThread.Priority = ThreadPriority.BelowNormal;
611 httpThread.IsBackground = true; 633 httpThread.IsBackground = true;
612 finished = false; 634 _finished = false;
613 httpThread.Start(); 635 httpThread.Start();
614 ThreadTracker.Add(httpThread); 636 ThreadTracker.Add(httpThread);
615
616 return reqID;
617 } 637 }
618 638
619 /* 639 /*
@@ -629,21 +649,21 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
629 // if not, use as method name 649 // if not, use as method name
630 UUID parseUID; 650 UUID parseUID;
631 string mName = "llRemoteData"; 651 string mName = "llRemoteData";
632 if ((channel != null) && (channel != "")) 652 if ((Channel != null) && (Channel != ""))
633 if (!UUID.TryParse(channel, out parseUID)) 653 if (!UUID.TryParse(Channel, out parseUID))
634 mName = channel; 654 mName = Channel;
635 else 655 else
636 param["Channel"] = channel; 656 param["Channel"] = Channel;
637 657
638 param["StringValue"] = sdata; 658 param["StringValue"] = Sdata;
639 param["IntValue"] = Convert.ToString(idata); 659 param["IntValue"] = Convert.ToString(Idata);
640 660
641 ArrayList parameters = new ArrayList(); 661 ArrayList parameters = new ArrayList();
642 parameters.Add(param); 662 parameters.Add(param);
643 XmlRpcRequest req = new XmlRpcRequest(mName, parameters); 663 XmlRpcRequest req = new XmlRpcRequest(mName, parameters);
644 try 664 try
645 { 665 {
646 XmlRpcResponse resp = req.Send(destURL, 30000); 666 XmlRpcResponse resp = req.Send(DestURL, 30000);
647 if (resp != null) 667 if (resp != null)
648 { 668 {
649 Hashtable respParms; 669 Hashtable respParms;
@@ -660,31 +680,31 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
660 { 680 {
661 if (respParms.Contains("StringValue")) 681 if (respParms.Contains("StringValue"))
662 { 682 {
663 sdata = (string) respParms["StringValue"]; 683 Sdata = (string) respParms["StringValue"];
664 } 684 }
665 if (respParms.Contains("IntValue")) 685 if (respParms.Contains("IntValue"))
666 { 686 {
667 idata = Convert.ToInt32((string) respParms["IntValue"]); 687 Idata = Convert.ToInt32((string) respParms["IntValue"]);
668 } 688 }
669 if (respParms.Contains("faultString")) 689 if (respParms.Contains("faultString"))
670 { 690 {
671 sdata = (string) respParms["faultString"]; 691 Sdata = (string) respParms["faultString"];
672 } 692 }
673 if (respParms.Contains("faultCode")) 693 if (respParms.Contains("faultCode"))
674 { 694 {
675 idata = Convert.ToInt32(respParms["faultCode"]); 695 Idata = Convert.ToInt32(respParms["faultCode"]);
676 } 696 }
677 } 697 }
678 } 698 }
679 } 699 }
680 catch (Exception we) 700 catch (Exception we)
681 { 701 {
682 sdata = we.Message; 702 Sdata = we.Message;
683 m_log.Warn("[SendRemoteDataRequest]: Request failed"); 703 m_log.Warn("[SendRemoteDataRequest]: Request failed");
684 m_log.Warn(we.StackTrace); 704 m_log.Warn(we.StackTrace);
685 } 705 }
686 706
687 finished = true; 707 _finished = true;
688 } 708 }
689 709
690 public void Stop() 710 public void Stop()
@@ -700,7 +720,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
700 720
701 public UUID GetReqID() 721 public UUID GetReqID()
702 { 722 {
703 return reqID; 723 return ReqID;
704 } 724 }
705 } 725 }
706} 726}
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index c860d01..b507c52 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;
36using log4net; 36using log4net;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Environment.Modules.World.Terrain; 41using OpenSim.Region.Environment.Modules.World.Terrain;
42 42
43namespace OpenSim.Region.Environment.Modules.World.Archiver 43namespace 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 179b82a..9a06bf7 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;
33using OpenMetaverse; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes;
37using OpenSim.Region.Environment.Modules.World.Serialiser; 38using OpenSim.Region.Environment.Modules.World.Serialiser;
38using OpenSim.Region.Environment.Modules.World.Terrain; 39using OpenSim.Region.Environment.Modules.World.Terrain;
39using OpenSim.Region.Environment.Scenes;
40 40
41namespace OpenSim.Region.Environment.Modules.World.Archiver 41namespace OpenSim.Region.Environment.Modules.World.Archiver
42{ 42{
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index a5f4770..56604d6 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -27,10 +27,10 @@
27 27
28using OpenSim.Framework; 28using OpenSim.Framework;
29using OpenSim.Framework.Communications.Cache; 29using OpenSim.Framework.Communications.Cache;
30using OpenSim.Region.Environment.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Framework.Scenes;
31using OpenSim.Region.Environment.Modules.World.Serialiser; 32using OpenSim.Region.Environment.Modules.World.Serialiser;
32using OpenSim.Region.Environment.Modules.World.Terrain; 33using OpenSim.Region.Environment.Modules.World.Terrain;
33using OpenSim.Region.Environment.Scenes;
34using System; 34using System;
35using System.Collections.Generic; 35using System.Collections.Generic;
36using System.IO; 36using System.IO;
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
index 9d9f81e..ed494fc 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;
33using log4net; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes;
37using OpenSim.Region.Environment.Modules.World.Serialiser; 38using OpenSim.Region.Environment.Modules.World.Serialiser;
38using OpenSim.Region.Environment.Scenes;
39 39
40namespace OpenSim.Region.Environment.Modules.World.Archiver 40namespace OpenSim.Region.Environment.Modules.World.Archiver
41{ 41{
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
index 035651a..7a6c810 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;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Environment.Modules.World.Archiver 39namespace OpenSim.Region.Environment.Modules.World.Archiver
40{ 40{
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs
index d7acd54..e265252 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;
32using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework.SyntaxHelpers;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Modules.World.Archiver; 36using OpenSim.Region.Environment.Modules.World.Archiver;
37using OpenSim.Region.Environment.Modules.World.Serialiser; 37using OpenSim.Region.Environment.Modules.World.Serialiser;
38using OpenSim.Region.Environment.Modules.World.Terrain; 38using OpenSim.Region.Environment.Modules.World.Terrain;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Tests.Common.Setup; 40using OpenSim.Tests.Common.Setup;
41 41
42namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests 42namespace OpenSim.Region.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 d906bbd..6b74c83 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;
32using log4net; 32using log4net;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.World.Estate 38namespace OpenSim.Region.Environment.Modules.World.Estate
39{ 39{
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs
index 2ba4e34..267178e 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;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37 37
38namespace OpenSim.Region.Environment.Modules.World.Estate 38namespace 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 9de0181..76555d2 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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Framework.Scenes;
34 34
35namespace OpenSim.Region.Environment.Modules.World.Land 35namespace OpenSim.Region.Environment.Modules.World.Land
36{ 36{
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
index 6f50102..58176e4 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;
32using OpenMetaverse; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Framework.Communications.Capabilities; 39using 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 89256fa..b5f7225 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;
31using OpenMetaverse; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37namespace OpenSim.Region.Environment.Modules.World.Land 37namespace OpenSim.Region.Environment.Modules.World.Land
38{ 38{
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index f0d5de2..9165554 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;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenMetaverse.Packets; 32using OpenMetaverse.Packets;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Environment.Modules.World.NPC 36namespace OpenSim.Region.Environment.Modules.World.NPC
37{ 37{
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs
index 7227cf0..2e7b16c 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs
@@ -27,8 +27,8 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using Nini.Config; 29using Nini.Config;
30using OpenSim.Region.Environment.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.Environment.Modules.World.NPC 33namespace OpenSim.Region.Environment.Modules.World.NPC
34{ 34{
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index f086396..060a4f4 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;
33using System.Reflection; 33using System.Reflection;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes;
37using OpenSim.Region.Environment.Modules.Framework; 38using OpenSim.Region.Environment.Modules.Framework;
38using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander; 39using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander;
39using OpenSim.Region.Environment.Scenes;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41 41
42namespace OpenSim.Region.Environment.Modules.World.Permissions 42namespace 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 40568e7..afad3cf 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Scenes; 28using OpenSim.Region.Framework.Scenes;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Serialiser 30namespace OpenSim.Region.Environment.Modules.World.Serialiser
31{ 31{
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
index 1fb78b6..8b3f2ce 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;
30using System.IO.Compression; 30using System.IO.Compression;
31using System.Text; 31using System.Text;
32using System.Xml; 32using System.Xml;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Framework.Scenes;
34 34
35namespace OpenSim.Region.Environment.Modules.World.Serialiser 35namespace OpenSim.Region.Environment.Modules.World.Serialiser
36{ 36{
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
index bd85264..d0ce3d8 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
@@ -27,7 +27,7 @@
27 27
28using OpenSim.Region.Environment.Modules.World.Terrain; 28using OpenSim.Region.Environment.Modules.World.Terrain;
29using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders; 29using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Modules.World.Serialiser 32namespace OpenSim.Region.Environment.Modules.World.Serialiser
33{ 33{
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
index f939adf..0e7873c 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;
30using System.IO; 30using System.IO;
31using OpenMetaverse; 31using OpenMetaverse;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander; 35using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander;
35using OpenSim.Region.Environment.Scenes;
36 36
37namespace OpenSim.Region.Environment.Modules.World.Serialiser 37namespace OpenSim.Region.Environment.Modules.World.Serialiser
38{ 38{
diff --git a/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs b/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs
index 4547480..1713797 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;
31using log4net; 31using log4net;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37namespace OpenSim.Region.Environment.World.Sound 37namespace OpenSim.Region.Environment.World.Sound
38{ 38{
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
index 9d8956e..ee96d58 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;
30using OpenMetaverse; 30using OpenMetaverse;
31using Nini.Config; 31using Nini.Config;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Environment.Modules 36namespace OpenSim.Region.Environment.Modules
37{ 37{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs
index c5e99b5..83246fb 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System;
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Scenes;
29using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; 30using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
30 31
31namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects 32namespace 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 5bc6799..2082137 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using OpenSim.Framework; 27using OpenSim.Framework;
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Scenes;
29 30
30namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects 31namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
31{ 32{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs
index 48da96d..a8e79d0 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 @@
28using System.Drawing; 28using System.Drawing;
29using System.Drawing.Imaging; 29using System.Drawing.Imaging;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
34{ 34{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs
index accffd2..b76fe05 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 @@
28using System.Drawing; 28using System.Drawing;
29using System.Drawing.Imaging; 29using System.Drawing.Imaging;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
34{ 34{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 983ad29..80873d9 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;
29using System.Drawing; 29using System.Drawing;
30using System.Drawing.Imaging; 30using System.Drawing.Imaging;
31using System.IO; 31using System.IO;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Framework.Scenes;
33 34
34namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 35namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
35{ 36{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs
index 35576c7..bea504d 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;
29using System.Drawing; 29using System.Drawing;
30using System.Drawing.Imaging; 30using System.Drawing.Imaging;
31using System.IO; 31using System.IO;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33 33
34namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 34namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
35{ 35{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
index 5158525..e323e28 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 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using OpenSim.Region.Environment.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Framework.Scenes;
31 32
32namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
33{ 34{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs
index 19e181e..25967f3 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 @@
28using System.Drawing; 28using System.Drawing;
29using System.Drawing.Imaging; 29using System.Drawing.Imaging;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
34{ 34{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs
index 758821a..7aff56a 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 @@
26 */ 26 */
27 27
28using System.IO; 28using System.IO;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes;
30 31
31namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 32namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
32{ 33{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs
index 95b43b0..0503487 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 @@
28using System.Drawing; 28using System.Drawing;
29using System.Drawing.Imaging; 29using System.Drawing.Imaging;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
34{ 34{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs
index 2bf029e..44d03e3 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 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Text; 30using System.Text;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32using OpenSim.Region.Framework.Scenes;
32 33
33namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders 34namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
34{ 35{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs
index f3c8a13..4d49a70 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
31{ 31{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs
index 3646d61..64f9014 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
31{ 31{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs
index f7c4893..2d44a3a 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 @@
26 */ 26 */
27 27
28using OpenSim.Framework; 28using OpenSim.Framework;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes;
30 31
31namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 32namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
32{ 33{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs
index 5eff3d6..0c7d016 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
31{ 31{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs
index 602a5cc..3f06d82 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
31{ 31{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs
index 8fd805e..3881264 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes 30namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
31{ 31{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs
index bbbe2a3..4533e9e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain 30namespace OpenSim.Region.Environment.Modules.World.Terrain
31{ 31{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs
index 9fe93a2..5bae84b 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Terrain 31namespace OpenSim.Region.Environment.Modules.World.Terrain
32{ 32{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs
index 950b27b..21bda58 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.IO; 28using System.IO;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Terrain 31namespace OpenSim.Region.Environment.Modules.World.Terrain
32{ 32{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs
index e2a9cde..7461560 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.World.Terrain 30namespace OpenSim.Region.Environment.Modules.World.Terrain
31{ 31{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
index 3fa3f8a..4d694cc 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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes;
30 31
31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 32namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
32{ 33{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
index c103d99..91c030d 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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes;
30 31
31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 32namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
32{ 33{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs
index 745d3da..d391e94 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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
32{ 32{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
index 23f7bc5..32a6869 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 @@
27 27
28using System; 28using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Region.Environment.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Framework.Scenes;
31 32
32namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 33namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
33{ 34{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
index 42ec794..86d01d3 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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes;
30 31
31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 32namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
32{ 33{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs
index 56813ab..a0ff262 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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes;
30 31
31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 32namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
32{ 33{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs
index d3a1d3d..af6d94d 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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes;
30 31
31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 32namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
32{ 33{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 0b4996f..fe270f7 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Scenes;
29 30
30namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
31{ 32{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
index 1288419..faba119 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Scenes;
29 30
30namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes 31namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
31{ 32{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
index 3c27872..bc601dc 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;
33using log4net; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes;
37using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander; 38using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander;
38using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders; 39using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
39using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes; 40using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
40using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; 41using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
41using OpenSim.Region.Environment.Scenes;
42 42
43namespace OpenSim.Region.Environment.Modules.World.Terrain 43namespace OpenSim.Region.Environment.Modules.World.Terrain
44{ 44{
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs
index 3511988..2acd5bc 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 @@
27 27
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Region.Framework.Scenes;
30using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes; 31using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
31 32
32namespace OpenSim.Region.Environment.Modules.World.Terrain.Tests 33namespace 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 f6b82a3..8a49540 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;
33using log4net; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Environment.Modules.World.TreePopulator 39namespace OpenSim.Region.Environment.Modules.World.TreePopulator
40{ 40{
diff --git a/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs
index a1c2192..4c4ca0d 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;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Environment.Modules.Avatar.Vegetation 39namespace OpenSim.Region.Environment.Modules.Avatar.Vegetation
40{ 40{
diff --git a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
index 52f52eb..8e54fd9 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;
30using OpenMetaverse; 30using OpenMetaverse;
31using Nini.Config; 31using Nini.Config;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Environment.Modules 36namespace OpenSim.Region.Environment.Modules
37{ 37{
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs
index bebcc52..cb0ac8c 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Drawing; 28using System.Drawing;
29using OpenSim.Region.Environment.Scenes; 29using OpenSim.Region.Framework.Scenes;
30using Nini.Config; 30using Nini.Config;
31 31
32namespace OpenSim.Region.Environment 32namespace OpenSim.Region.Environment
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
index 1c43724..a806c7d 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;
35using Nini.Config; 35using Nini.Config;
36using OpenMetaverse.Imaging; 36using OpenMetaverse.Imaging;
37using log4net; 37using log4net;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using OpenMetaverse; 40using OpenMetaverse;
41 41
42namespace OpenSim.Region.Environment.Modules.World.WorldMap 42namespace 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 6541571..fcac7e1 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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.Environment.Scenes.Hypergrid; 34using OpenSim.Region.Framework.Scenes.Hypergrid;
35using OpenMetaverse; 35using OpenMetaverse;
36using log4net; 36using log4net;
37using Nini.Config; 37using Nini.Config;
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs
index dffa72a..7fe538e 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;
36using OpenMetaverse.Imaging; 36using OpenMetaverse.Imaging;
37using Nini.Config; 37using Nini.Config;
38using log4net; 38using log4net;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.Environment.Modules.World.WorldMap 42namespace OpenSim.Region.Environment.Modules.World.WorldMap
43{ 43{
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs
index d66bbdb..d23c352 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;
37using log4net; 37using log4net;
38using OpenMetaverse.Imaging; 38using OpenMetaverse.Imaging;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Environment.Modules.World.Terrain; 42using OpenSim.Region.Environment.Modules.World.Terrain;
43 43
44namespace OpenSim.Region.Environment.Modules.World.WorldMap 44namespace 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 cf1900b..37b4547 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;
43using OpenSim.Framework.Communications.Cache; 43using OpenSim.Framework.Communications.Cache;
44using OpenSim.Framework.Communications.Capabilities; 44using OpenSim.Framework.Communications.Capabilities;
45using OpenSim.Framework.Servers; 45using OpenSim.Framework.Servers;
46using OpenSim.Region.Environment.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.Environment.Scenes; 47using OpenSim.Region.Framework.Scenes;
48using OpenSim.Region.Environment.Types; 48using OpenSim.Region.Framework.Scenes.Types;
49using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 49using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
50 50
51using OSD = OpenMetaverse.StructuredData.OSD; 51using OSD = OpenMetaverse.StructuredData.OSD;
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index fd37d76..db9ace1 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -27,7 +27,7 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Examples.SimpleModule 32namespace OpenSim.Region.Examples.SimpleModule
33{ 33{
diff --git a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs
index 4038564..da909c3 100644
--- a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs
@@ -29,7 +29,7 @@ using System;
29using System.Diagnostics; 29using System.Diagnostics;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Framework.Scenes;
33 33
34namespace OpenSim.Region.Examples.SimpleModule 34namespace OpenSim.Region.Examples.SimpleModule
35{ 35{
diff --git a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
index 2b84f1d..fe3d14f 100644
--- a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
@@ -28,7 +28,7 @@
28using System.IO; 28using System.IO;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.Examples.SimpleModule 33namespace OpenSim.Region.Examples.SimpleModule
34{ 34{
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 3710f2c..aac5990 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -31,7 +31,7 @@ using System.Net;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenMetaverse.Packets; 32using OpenMetaverse.Packets;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Examples.SimpleModule 36namespace OpenSim.Region.Examples.SimpleModule
37{ 37{
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
index 0d7919d..6c9cf2c 100644
--- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
+++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
@@ -30,8 +30,8 @@ using System.IO;
30using OpenMetaverse; 30using OpenMetaverse;
31using Nini.Config; 31using Nini.Config;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Examples.SimpleModule 36namespace OpenSim.Region.Examples.SimpleModule
37{ 37{
diff --git a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
index 43c733d..49a5dd0 100644
--- a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
@@ -27,9 +27,10 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Framework.Scenes;
31 32
32namespace OpenSim.Region.Environment.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
33{ 34{
34 public interface IAgentAssetTransactions 35 public interface IAgentAssetTransactions
35 { 36 {
diff --git a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
index a722833..b533206 100644
--- a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
@@ -27,9 +27,9 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Framework.Interfaces;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface IAvatarFactory 34 public interface IAvatarFactory
35 { 35 {
diff --git a/OpenSim/Region/Environment/Interfaces/ICapabilitiesModule.cs b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
index 8a2c549..bac0b2e 100644
--- a/OpenSim/Region/Environment/Interfaces/ICapabilitiesModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
@@ -31,7 +31,7 @@ using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 32using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
33 33
34namespace OpenSim.Region.Environment.Interfaces 34namespace OpenSim.Region.Framework.Interfaces
35{ 35{
36 public interface ICapabilitiesModule 36 public interface ICapabilitiesModule
37 { 37 {
diff --git a/OpenSim/Region/Environment/Interfaces/ICommand.cs b/OpenSim/Region/Framework/Interfaces/ICommand.cs
index c1da2c3..1551b58 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommand.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICommand.cs
@@ -27,7 +27,7 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29 29
30namespace OpenSim.Region.Environment.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
31{ 31{
32 public enum CommandIntentions 32 public enum CommandIntentions
33 { 33 {
diff --git a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs b/OpenSim/Region/Framework/Interfaces/ICommandableModule.cs
index c4ed942..5d6660d 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICommandableModule.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.Environment.Interfaces 28namespace OpenSim.Region.Framework.Interfaces
29{ 29{
30 public interface ICommandableModule 30 public interface ICommandableModule
31 { 31 {
diff --git a/OpenSim/Region/Environment/Interfaces/ICommander.cs b/OpenSim/Region/Framework/Interfaces/ICommander.cs
index a61ce490..17a2e4a 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommander.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICommander.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.Environment.Interfaces 28namespace OpenSim.Region.Framework.Interfaces
29{ 29{
30 public interface ICommander 30 public interface ICommander
31 { 31 {
diff --git a/OpenSim/Region/Environment/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
index 755aa27..7247d52 100644
--- a/OpenSim/Region/Environment/Interfaces/IDialogModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
@@ -29,7 +29,7 @@ using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface IDialogModule 34 public interface IDialogModule
35 { 35 {
diff --git a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
index c54c697..e119bc3 100644
--- a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
@@ -28,7 +28,7 @@
28using System.IO; 28using System.IO;
29using OpenMetaverse; 29using OpenMetaverse;
30 30
31namespace OpenSim.Region.Environment.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
32{ 32{
33 public interface IDynamicTextureManager 33 public interface IDynamicTextureManager
34 { 34 {
diff --git a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
index 5f1bcf3..b5f885a 100644
--- a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
@@ -29,7 +29,7 @@ using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public class Email 34 public class Email
35 { 35 {
diff --git a/OpenSim/Region/Environment/Interfaces/IEntityCreator.cs b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
index f45e959..1a6e626 100644
--- a/OpenSim/Region/Environment/Interfaces/IEntityCreator.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
@@ -27,9 +27,9 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 /// <summary> 34 /// <summary>
35 /// Interface to a class that is capable of creating entities 35 /// 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
index a270293..20fe090 100644
--- a/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -32,11 +32,10 @@ using OpenMetaverse;
32using log4net; 32using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Scenes.Scripting;
37using OpenSim.Region.Environment.Scenes.Scripting;
38 37
39namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Framework.Interfaces
40{ 39{
41 /// <summary> 40 /// <summary>
42 /// Interface to an entity's (SceneObjectPart's) inventory 41 /// Interface to an entity's (SceneObjectPart's) inventory
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
index f2d14a6..4da115e 100644
--- a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
@@ -29,7 +29,7 @@ using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface IEstateDataStore 34 public interface IEstateDataStore
35 { 35 {
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index d84af20..f169f61 100644
--- a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -29,7 +29,7 @@ using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface IEstateModule : IRegionModule 34 public interface IEstateModule : IRegionModule
35 { 35 {
diff --git a/OpenSim/Region/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index 5c327d9..cf609ae 100644
--- a/OpenSim/Region/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -26,16 +26,39 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Net;
29using OpenSim.Framework; 30using OpenSim.Framework;
30using OpenMetaverse; 31using OpenMetaverse;
32using OpenMetaverse.Packets;
31using OpenMetaverse.StructuredData; 33using OpenMetaverse.StructuredData;
32using System.Collections.Generic; 34using System.Collections.Generic;
33using System.Text; 35using System.Text;
34 36
35namespace OpenSim.Region.Interfaces 37namespace OpenSim.Region.Framework.Interfaces
36{ 38{
37 public interface IEventQueue 39 public interface IEventQueue
38 { 40 {
39 bool Enqueue(OSD o, UUID avatarID); 41 bool Enqueue(OSD o, UUID avatarID);
42
43 // These are required to decouple Scenes from EventQueueHelper
44 void DisableSimulator(ulong handle, UUID avatarID);
45 void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID);
46 void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint,
47 string capsPath);
48 void TeleportFinishEvent(ulong regionHandle, byte simAccess,
49 IPEndPoint regionExternalEndPoint,
50 uint locationID, uint flags, string capsURL,
51 UUID agentID);
52 void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
53 IPEndPoint newRegionExternalEndPoint,
54 string capsURL, UUID avatarID, UUID sessionID);
55 void ChatterboxInvitation(UUID sessionID, string sessionName,
56 UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
57 uint timeStamp, bool offline, int parentEstateID, Vector3 position,
58 uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket);
59 void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat,
60 bool isModerator, bool textMute);
61 void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID);
62 void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID);
40 } 63 }
41} 64}
diff --git a/OpenSim/Region/Environment/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
index 5d3376c..0bdfb8f 100644
--- a/OpenSim/Region/Environment/Interfaces/IFriendsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
@@ -28,7 +28,7 @@
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30 30
31namespace OpenSim.Region.Environment.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
32{ 32{
33 public interface IFriendsModule 33 public interface IFriendsModule
34 { 34 {
diff --git a/OpenSim/Region/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
index c3f901a..16527d1 100644
--- a/OpenSim/Region/Interfaces/IGroupsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenMetaverse; 31using OpenMetaverse;
32 32
33namespace OpenSim.Region.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
34{ 34{
35 public delegate void NewGroupNotice(UUID groupID, UUID noticeID); 35 public delegate void NewGroupNotice(UUID groupID, UUID noticeID);
36 36
diff --git a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
index 216782b..fd49757 100644
--- a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
@@ -25,18 +25,27 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net;
29using OpenMetaverse; 31using OpenMetaverse;
30using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
31 32
32namespace OpenSim.Region.Environment.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
33{ 34{
34 public interface IHttpRequests 35 public enum HttpRequestConstants
36 {
37 HTTP_METHOD = 0,
38 HTTP_MIMETYPE = 1,
39 HTTP_BODY_MAXLENGTH = 2,
40 HTTP_VERIFY_CERT = 3,
41 }
42
43 public interface IHttpRequestModule
35 { 44 {
36 UUID MakeHttpRequest(string url, string parameters, string body); 45 UUID MakeHttpRequest(string url, string parameters, string body);
37 UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body); 46 UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body);
38 void StopHttpRequest(uint m_localID, UUID m_itemID); 47 void StopHttpRequest(uint m_localID, UUID m_itemID);
39 HttpRequestClass GetNextCompletedRequest(); 48 IServiceRequest GetNextCompletedRequest();
40 void RemoveCompletedRequest(UUID id); 49 void RemoveCompletedRequest(UUID id);
41 } 50 }
42} 51}
diff --git a/OpenSim/Region/Environment/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
index 7aeef15..783b3f9 100644
--- a/OpenSim/Region/Environment/Interfaces/IInterregionComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
@@ -29,7 +29,7 @@ using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public delegate bool ChildAgentUpdateReceived(AgentData data); 34 public delegate bool ChildAgentUpdateReceived(AgentData data);
35 35
diff --git a/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
index ee170b9..4314271 100644
--- a/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
@@ -27,10 +27,9 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Region.Environment; 30using OpenSim.Region.Framework.Scenes;
31using OpenSim.Region.Environment.Scenes;
32 31
33namespace OpenSim.Framework 32namespace OpenSim.Region.Framework.Interfaces
34{ 33{
35 /// <summary> 34 /// <summary>
36 /// An interface for a module that manages inter-agent inventory offers and transfers. 35 /// 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
index 2a37195..1d10896 100644
--- a/OpenSim/Region/Environment/Interfaces/IJ2KDecoder.cs
+++ b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
@@ -28,7 +28,7 @@
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenMetaverse.Imaging; 29using OpenMetaverse.Imaging;
30 30
31namespace OpenSim.Region.Environment.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
32{ 32{
33 33
34 public delegate void DecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers); 34 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
index a8a58ef..35c2fc1 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -28,9 +28,9 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Environment.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
34{ 34{
35 public interface ILandChannel 35 public interface ILandChannel
36 { 36 {
diff --git a/OpenSim/Region/Environment/Interfaces/ILandObject.cs b/OpenSim/Region/Framework/Interfaces/ILandObject.cs
index 6fcf74b..52cc6cf 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandObject.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandObject.cs
@@ -28,9 +28,9 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.Environment.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
34{ 34{
35 public delegate int overrideParcelMaxPrimCountDelegate(ILandObject obj); 35 public delegate int overrideParcelMaxPrimCountDelegate(ILandObject obj);
36 public delegate int overrideSimulatorMaxPrimCountDelegate(ILandObject obj); 36 public delegate int overrideSimulatorMaxPrimCountDelegate(ILandObject obj);
diff --git a/OpenSim/Region/Interfaces/IMessageTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
index ecaeceb..f0a5473 100644
--- a/OpenSim/Region/Interfaces/IMessageTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
@@ -29,7 +29,7 @@ using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public delegate void MessageResultNotification(bool success); 34 public delegate void MessageResultNotification(bool success);
35 35
diff --git a/OpenSim/Region/Interfaces/IPresenceModule.cs b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
index 23cf064..011f8bb 100644
--- a/OpenSim/Region/Interfaces/IPresenceModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
@@ -29,7 +29,7 @@ using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public struct PresenceInfo 34 public struct PresenceInfo
35 { 35 {
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 559d2a6..97afe8d 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -27,7 +27,7 @@
27 27
28using System.IO; 28using System.IO;
29 29
30namespace OpenSim.Region.Environment.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
31{ 31{
32 /// <summary> 32 /// <summary>
33 /// Interface to region archive functionality 33 /// Interface to region archive functionality
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
index 78fc626..46d81ce 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
@@ -28,9 +28,9 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.Environment.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
34{ 34{
35 public interface IRegionDataStore 35 public interface IRegionDataStore
36 { 36 {
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
index ffa4f32..6a45017 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
@@ -26,9 +26,9 @@
26 */ 26 */
27 27
28using Nini.Config; 28using Nini.Config;
29using OpenSim.Region.Environment.Scenes; 29using OpenSim.Region.Framework.Scenes;
30 30
31namespace OpenSim.Region.Environment.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
32{ 32{
33 public interface IRegionModule 33 public interface IRegionModule
34 { 34 {
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
index b89f869..40e4c99 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
@@ -28,9 +28,9 @@
28using OpenMetaverse; 28using OpenMetaverse;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.Environment.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
34{ 34{
35 public interface IRegionSerialiserModule 35 public interface IRegionSerialiserModule
36 { 36 {
diff --git a/OpenSim/Region/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index 9dca862..65620d3 100644
--- a/OpenSim/Region/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -29,7 +29,7 @@ using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface IScriptModule 34 public interface IScriptModule
35 { 35 {
diff --git a/OpenSim/Region/Framework/Interfaces/IServiceRequest.cs b/OpenSim/Region/Framework/Interfaces/IServiceRequest.cs
new file mode 100644
index 0000000..f3283c4
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IServiceRequest.cs
@@ -0,0 +1,45 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27using OpenMetaverse;
28
29namespace OpenSim.Region.Framework.Interfaces
30{
31 public interface IServiceRequest
32 {
33 // Status
34 bool Finished { get; }
35
36 // Request info
37 UUID ItemID { get; set; }
38 uint LocalID { get; set; }
39 UUID ReqID { get; set; }
40
41 void Process();
42 void SendRequest();
43 void Stop();
44 }
45} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index 3bb4c57..91c80e3 100644
--- a/OpenSim/Region/Environment/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -29,7 +29,7 @@ using System;
29using Nini.Config; 29using Nini.Config;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface ISoundModule 34 public interface ISoundModule
35 { 35 {
diff --git a/OpenSim/Region/Environment/Interfaces/ITerrain.cs b/OpenSim/Region/Framework/Interfaces/ITerrain.cs
index d5e1540..6e9c98d 100644
--- a/OpenSim/Region/Environment/Interfaces/ITerrain.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrain.cs
@@ -27,7 +27,7 @@
27 27
28using OpenSim.Framework; 28using OpenSim.Framework;
29 29
30namespace OpenSim.Region.Environment.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
31{ 31{
32 public interface ITerrain 32 public interface ITerrain
33 { 33 {
diff --git a/OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs
index 4bcb14b..fc4ced2 100644
--- a/OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.Environment.Interfaces 28namespace OpenSim.Region.Framework.Interfaces
29{ 29{
30 public interface ITerrainChannel 30 public interface ITerrainChannel
31 { 31 {
diff --git a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs b/OpenSim/Region/Framework/Interfaces/ITextureSender.cs
index ece1953..aab3d26 100644
--- a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITextureSender.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.Environment.Interfaces 28namespace OpenSim.Region.Framework.Interfaces
29{ 29{
30 /// <summary> 30 /// <summary>
31 /// Interface for an object which can send texture information to a client 31 /// 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
index c411993..537a8dc 100644
--- a/OpenSim/Region/Environment/Interfaces/IVegetationModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs
@@ -26,9 +26,9 @@
26 */ 26 */
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Region.Environment.Scenes; 29using OpenSim.Region.Framework.Scenes;
30 30
31namespace OpenSim.Region.Environment.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
32{ 32{
33 public interface IVegetationModule : IEntityCreator 33 public interface IVegetationModule : IEntityCreator
34 { 34 {
diff --git a/OpenSim/Region/Environment/Interfaces/IWindModule.cs b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
index 9896c56..96b303f 100644
--- a/OpenSim/Region/Environment/Interfaces/IWindModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
@@ -29,7 +29,7 @@ using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface IWindModule : IRegionModule 34 public interface IWindModule : IRegionModule
35 { 35 {
diff --git a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index 1a33450..24865db 100644
--- a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -28,21 +28,37 @@
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Modules.Scripting.WorldComm; 31// using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
32 32
33namespace OpenSim.Region.Environment.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
34{ 34{
35 public interface IWorldCommListenerInfo
36 {
37 Object[] GetSerializationData();
38 UUID GetItemID();
39 UUID GetHostID();
40 int GetChannel();
41 uint GetLocalID();
42 int GetHandle();
43 string GetMessage();
44 string GetName();
45 bool IsActive();
46 void Deactivate();
47 void Activate();
48 UUID GetID();
49 }
50
35 public interface IWorldComm 51 public interface IWorldComm
36 { 52 {
37 int Listen(uint LocalID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg); 53 int Listen(uint LocalID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg);
38 void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg); 54 void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg);
39 bool HasMessages(); 55 bool HasMessages();
40 ListenerInfo GetNextMessage(); 56 IWorldCommListenerInfo GetNextMessage();
41 void ListenControl(UUID itemID, int handle, int active); 57 void ListenControl(UUID itemID, int handle, int active);
42 void ListenRemove(UUID itemID, int handle); 58 void ListenRemove(UUID itemID, int handle);
43 void DeleteListener(UUID itemID); 59 void DeleteListener(UUID itemID);
44 Object[] GetSerializationData(UUID itemID); 60 Object[] GetSerializationData(UUID itemID);
45 void CreateFromData(uint localID, UUID itemID, UUID hostID, 61 void CreateFromData(uint localID, UUID itemID, UUID hostID,
46 Object[] data); 62 Object[] data);
47 } 63 }
48} 64}
diff --git a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
index 88e9ab5..6570b0a 100644
--- a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
@@ -26,10 +26,28 @@
26 */ 26 */
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; 29using Nwc.XmlRpc;
30 30
31namespace OpenSim.Region.Environment.Interfaces 31// using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
32
33namespace OpenSim.Region.Framework.Interfaces
32{ 34{
35 public interface IXmlRpcRequestInfo
36 {
37 bool IsProcessed();
38 UUID GetChannelKey();
39 void SetProcessed(bool processed);
40 void SetStrRetval(string resp);
41 string GetStrRetval();
42 void SetIntRetval(int resp);
43 int GetIntRetval();
44 uint GetLocalID();
45 UUID GetItemID();
46 string GetStrVal();
47 int GetIntValue();
48 UUID GetMessageID();
49 }
50
33 public interface IXMLRPC 51 public interface IXMLRPC
34 { 52 {
35 UUID OpenXMLRPCChannel(uint localID, UUID itemID, UUID channelID); 53 UUID OpenXMLRPCChannel(uint localID, UUID itemID, UUID channelID);
@@ -37,11 +55,11 @@ namespace OpenSim.Region.Environment.Interfaces
37 bool hasRequests(); 55 bool hasRequests();
38 void RemoteDataReply(string channel, string message_id, string sdata, int idata); 56 void RemoteDataReply(string channel, string message_id, string sdata, int idata);
39 bool IsEnabled(); 57 bool IsEnabled();
40 RPCRequestInfo GetNextCompletedRequest(); 58 IXmlRpcRequestInfo GetNextCompletedRequest();
41 void RemoveCompletedRequest(UUID id); 59 void RemoveCompletedRequest(UUID id);
42 void DeleteChannels(UUID itemID); 60 void DeleteChannels(UUID itemID);
43 UUID SendRemoteData(uint localID, UUID itemID, string channel, string dest, int idata, string sdata); 61 UUID SendRemoteData(uint localID, UUID itemID, string channel, string dest, int idata, string sdata);
44 SendRemoteDataRequest GetNextCompletedSRDRequest(); 62 IServiceRequest GetNextCompletedSRDRequest();
45 void RemoveCompletedSRDRequest(UUID id); 63 void RemoveCompletedSRDRequest(UUID id);
46 void CancelSRDRequests(UUID itemID); 64 void CancelSRDRequests(UUID itemID);
47 } 65 }
diff --git a/OpenSim/Region/Environment/Interfaces/IXfer.cs b/OpenSim/Region/Framework/Interfaces/IXfer.cs
index bad1833..a83f166 100644
--- a/OpenSim/Region/Environment/Interfaces/IXfer.cs
+++ b/OpenSim/Region/Framework/Interfaces/IXfer.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.Environment.Interfaces 28namespace OpenSim.Region.Framework.Interfaces
29{ 29{
30 public interface IXfer 30 public interface IXfer
31 { 31 {
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Framework/ModuleLoader.cs
index f06fa0f..d393919 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Framework/ModuleLoader.cs
@@ -31,18 +31,10 @@ using System.IO;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Environment.Modules.Avatar.Chat;
37using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
38using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
39using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
40using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
41using OpenSim.Region.Environment.Scenes;
42 36
43//TODO: Why do we reference InstantMessageModule here? 37namespace OpenSim.Region.Framework
44
45namespace OpenSim.Region.Environment
46{ 38{
47 public class ModuleLoader 39 public class ModuleLoader
48 { 40 {
@@ -81,83 +73,19 @@ namespace OpenSim.Region.Environment
81 return modules; 73 return modules;
82 } 74 }
83 75
84 public void LoadDefaultSharedModules() 76 public void LoadDefaultSharedModule(IRegionModule module)
85 { 77 {
86 DynamicTextureModule dynamicModule = new DynamicTextureModule(); 78 if (m_loadedSharedModules.ContainsKey(module.Name))
87 if (m_loadedSharedModules.ContainsKey(dynamicModule.Name))
88 {
89 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule");
90 }
91 else
92 {
93 m_loadedSharedModules.Add(dynamicModule.Name, dynamicModule);
94 }
95
96 // ChatModule chat = new ChatModule();
97 // if (m_loadedSharedModules.ContainsKey(chat.Name))
98 // {
99 // m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule");
100 // }
101 // else
102 // {
103 // m_loadedSharedModules.Add(chat.Name, chat);
104 // }
105
106 InstantMessageModule imMod = new InstantMessageModule();
107 if (m_loadedSharedModules.ContainsKey(imMod.Name))
108 { 79 {
109 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule"); 80 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module not added!", module.Name);
110 } 81 }
111 else 82 else
112 { 83 {
113 m_loadedSharedModules.Add(imMod.Name, imMod); 84 m_loadedSharedModules.Add(module.Name, module);
114 }
115
116 LoadImageURLModule loadMod = new LoadImageURLModule();
117 if (m_loadedSharedModules.ContainsKey(loadMod.Name))
118 {
119 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule");
120 }
121 else
122 {
123 m_loadedSharedModules.Add(loadMod.Name, loadMod);
124 }
125
126 // AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
127 // if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
128 // {
129 // m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
130 // }
131 // else
132 // {
133 // m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory);
134 // }
135
136 XMLRPCModule xmlRpcMod = new XMLRPCModule();
137 if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name))
138 {
139 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule");
140 }
141 else
142 {
143 m_loadedSharedModules.Add(xmlRpcMod.Name, xmlRpcMod);
144 }
145 //TextureDownloadModule textureModule = new TextureDownloadModule();
146
147 //LoadedSharedModules.Add(textureModule.Name, textureModule);
148
149 AssetTransactionModule transactionsModule = new AssetTransactionModule();
150 if (m_loadedSharedModules.ContainsKey(transactionsModule.Name))
151 {
152 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule");
153 }
154 else
155 {
156 m_loadedSharedModules.Add(transactionsModule.Name, transactionsModule);
157 } 85 }
158
159 } 86 }
160 87
88
161 public void InitialiseSharedModules(Scene scene) 89 public void InitialiseSharedModules(Scene scene)
162 { 90 {
163 foreach (IRegionModule module in m_loadedSharedModules.Values) 91 foreach (IRegionModule module in m_loadedSharedModules.Values)
diff --git a/OpenSim/Region/Environment/Scenes/Animation.cs b/OpenSim/Region/Framework/Scenes/Animation.cs
index 2854e06..3504717 100644
--- a/OpenSim/Region/Environment/Scenes/Animation.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30 30
31namespace OpenSim.Region.Environment.Scenes 31namespace OpenSim.Region.Framework.Scenes
32{ 32{
33 public class Animation 33 public class Animation
34 { 34 {
diff --git a/OpenSim/Region/Environment/Scenes/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
index df25173..f53bb78 100644
--- a/OpenSim/Region/Environment/Scenes/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Scenes 32namespace OpenSim.Region.Framework.Scenes
33{ 33{
34 public class AnimationSet 34 public class AnimationSet
35 { 35 {
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 1429452..178f1f7 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -34,7 +34,7 @@ using OpenMetaverse;
34using OpenMetaverse.Packets; 34using OpenMetaverse.Packets;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Region.Environment.Scenes 37namespace OpenSim.Region.Framework.Scenes
38{ 38{
39 class DeleteToInventoryHolder 39 class DeleteToInventoryHolder
40 { 40 {
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
index d4dd0db..562fcf9 100644
--- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
29using System.Xml; 29using System.Xml;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Scenes 32namespace OpenSim.Region.Framework.Scenes
33{ 33{
34 public class AvatarAnimations 34 public class AvatarAnimations
35 { 35 {
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 3ae8cde..5055e44 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -30,7 +30,7 @@ using System.Runtime.Serialization;
30using System.Security.Permissions; 30using System.Security.Permissions;
31using OpenMetaverse; 31using OpenMetaverse;
32 32
33namespace OpenSim.Region.Environment.Scenes 33namespace OpenSim.Region.Framework.Scenes
34{ 34{
35 [Serializable] 35 [Serializable]
36 public abstract class EntityBase : ISerializable 36 public abstract class EntityBase : ISerializable
diff --git a/OpenSim/Region/Environment/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index f89d361..a322766 100644
--- a/OpenSim/Region/Environment/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -33,7 +33,7 @@ using log4net;
33using OpenMetaverse; 33using OpenMetaverse;
34 34
35 35
36namespace OpenSim.Region.Environment.Scenes 36namespace OpenSim.Region.Framework.Scenes
37{ 37{
38 public class EntityManager : IEnumerable<EntityBase> 38 public class EntityManager : IEnumerable<EntityBase>
39 { 39 {
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index bba7eed..23e1278 100644
--- a/OpenSim/Region/Environment/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -29,11 +29,12 @@ using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Client; 31using OpenSim.Framework.Client;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using Caps=OpenSim.Framework.Communications.Capabilities.Caps; 33using OpenSim.Region.Framework.Scenes;
34using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
34using System.Collections.Generic; 35using System.Collections.Generic;
35 36
36namespace OpenSim.Region.Environment.Scenes 37namespace OpenSim.Region.Framework.Scenes
37{ 38{
38 /// <summary> 39 /// <summary>
39 /// A class for triggering remote scene events. 40 /// 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
index 73a5a3a..bd9c260 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -40,13 +40,13 @@ using OpenSim.Framework;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.Region.Environment; 43// using OpenSim.Region.Environment;
44using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Framework.Scenes;
45 45
46//using HyperGrid.Framework; 46//using HyperGrid.Framework;
47//using OpenSim.Region.Communications.Hypergrid; 47//using OpenSim.Region.Communications.Hypergrid;
48 48
49namespace OpenSim.Region.Environment.Scenes.Hypergrid 49namespace OpenSim.Region.Framework.Scenes.Hypergrid
50{ 50{
51 public class HGAssetMapper 51 public class HGAssetMapper
52 { 52 {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index bdb90d8..f36075e 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;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.Region.Environment; 43// using OpenSim.Region.Environment;
44using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Framework.Scenes;
45 45
46namespace OpenSim.Region.Environment.Scenes.Hypergrid 46namespace OpenSim.Region.Framework.Scenes.Hypergrid
47{ 47{
48 public partial class HGScene : Scene 48 public partial class HGScene : Scene
49 { 49 {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
index ca644a6..a52fdc6 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
@@ -34,11 +34,11 @@ using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35 35
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Region.Environment; 37// using OpenSim.Region.Environment;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using TPFlags = OpenSim.Framework.Constants.TeleportFlags; 39using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
40 40
41namespace OpenSim.Region.Environment.Scenes.Hypergrid 41namespace OpenSim.Region.Framework.Scenes.Hypergrid
42{ 42{
43 public partial class HGScene : Scene 43 public partial class HGScene : Scene
44 { 44 {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 5e3e03f..d0dc4f7 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -38,11 +38,11 @@ using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Communications.Capabilities; 40using OpenSim.Framework.Communications.Capabilities;
41using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Environment; 42// using OpenSim.Region.Environment;
43using OpenSim.Region.Interfaces; 43using OpenSim.Region.Framework.Interfaces;
44 44
45namespace OpenSim.Region.Environment.Scenes.Hypergrid 45namespace OpenSim.Region.Framework.Scenes.Hypergrid
46{ 46{
47 public class HGSceneCommunicationService : SceneCommunicationService 47 public class HGSceneCommunicationService : SceneCommunicationService
48 { 48 {
@@ -208,16 +208,14 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
208 208
209 if (eq != null) 209 if (eq != null)
210 { 210 {
211 OSD Item = EventQueueHelper.EnableSimulator(realHandle, endPoint); 211 eq.EnableSimulator(realHandle, endPoint, avatar.UUID);
212 eq.Enqueue(Item, avatar.UUID);
213 212
214 // ES makes the client send a UseCircuitCode message to the destination, 213 // ES makes the client send a UseCircuitCode message to the destination,
215 // which triggers a bunch of things there. 214 // which triggers a bunch of things there.
216 // So let's wait 215 // So let's wait
217 Thread.Sleep(2000); 216 Thread.Sleep(2000);
218 217
219 Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath); 218 eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
220 eq.Enqueue(Item, avatar.UUID);
221 } 219 }
222 else 220 else
223 { 221 {
@@ -267,9 +265,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
267 /// 265 ///
268 if (eq != null) 266 if (eq != null)
269 { 267 {
270 OSD Item = EventQueueHelper.TeleportFinishEvent(realHandle, 13, endPoint, 268 eq.TeleportFinishEvent(realHandle, 13, endPoint,
271 4, teleportFlags, capsPath, avatar.UUID); 269 4, teleportFlags, capsPath, avatar.UUID);
272 eq.Enqueue(Item, avatar.UUID);
273 } 270 }
274 else 271 else
275 { 272 {
diff --git a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Framework/Scenes/IScenePresenceBody.cs
index 9a4c72f..bd5ad33 100644
--- a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Framework/Scenes/IScenePresenceBody.cs
@@ -28,7 +28,7 @@
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30 30
31namespace OpenSim.Region.Environment.Scenes 31namespace OpenSim.Region.Framework.Scenes
32{ 32{
33 public interface IScenePresenceBody 33 public interface IScenePresenceBody
34 { 34 {
diff --git a/OpenSim/Region/Environment/Scenes/ReturnInfo.cs b/OpenSim/Region/Framework/Scenes/ReturnInfo.cs
index 898baab..43d07f5 100644
--- a/OpenSim/Region/Environment/Scenes/ReturnInfo.cs
+++ b/OpenSim/Region/Framework/Scenes/ReturnInfo.cs
@@ -27,7 +27,7 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29 29
30namespace OpenSim.Region.Environment.Scenes 30namespace OpenSim.Region.Framework.Scenes
31{ 31{
32 public struct ReturnInfo 32 public struct ReturnInfo
33 { 33 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index bc80d56..e366c79 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -34,10 +34,10 @@ using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Region.Interfaces; 37using OpenSim.Region.Framework;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39 39
40namespace OpenSim.Region.Environment.Scenes 40namespace OpenSim.Region.Framework.Scenes
41{ 41{
42 public partial class Scene 42 public partial class Scene
43 { 43 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 3334e81..039b81b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35 35
36namespace OpenSim.Region.Environment.Scenes 36namespace OpenSim.Region.Framework.Scenes
37{ 37{
38 public partial class Scene 38 public partial class Scene
39 { 39 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 0872128..6aa617f 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;
30using System.Text; 30using System.Text;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34 34
35namespace OpenSim.Region.Environment.Scenes 35namespace OpenSim.Region.Framework.Scenes
36{ 36{
37 public class ScenePermissions 37 public class ScenePermissions
38 { 38 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f798a0e..f07391d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -40,10 +40,8 @@ using OpenSim.Framework;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.Region.Environment.Interfaces; 43using OpenSim.Region.Framework.Interfaces;
44using OpenSim.Region.Interfaces; 44using OpenSim.Region.Framework.Scenes.Scripting;
45using OpenSim.Region.Environment.Modules.World.Terrain;
46using OpenSim.Region.Environment.Scenes.Scripting;
47using OpenSim.Region.Physics.Manager; 45using OpenSim.Region.Physics.Manager;
48using Nini.Config; 46using Nini.Config;
49using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 47using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
@@ -52,7 +50,7 @@ using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
52using Timer = System.Timers.Timer; 50using Timer = System.Timers.Timer;
53using OSD = OpenMetaverse.StructuredData.OSD; 51using OSD = OpenMetaverse.StructuredData.OSD;
54 52
55namespace OpenSim.Region.Environment.Scenes 53namespace OpenSim.Region.Framework.Scenes
56{ 54{
57 public delegate bool FilterAvatarList(ScenePresence avatar); 55 public delegate bool FilterAvatarList(ScenePresence avatar);
58 56
@@ -123,7 +121,12 @@ namespace OpenSim.Region.Environment.Scenes
123 protected IInterregionCommsOut m_interregionCommsOut; 121 protected IInterregionCommsOut m_interregionCommsOut;
124 protected IInterregionCommsIn m_interregionCommsIn; 122 protected IInterregionCommsIn m_interregionCommsIn;
125 protected IDialogModule m_dialogModule; 123 protected IDialogModule m_dialogModule;
126 protected internal ICapabilitiesModule CapsModule; 124
125 protected ICapabilitiesModule m_capsModule;
126 public ICapabilitiesModule CapsModule
127 {
128 get { return m_capsModule; }
129 }
127 130
128 // Central Update Loop 131 // Central Update Loop
129 132
@@ -747,7 +750,7 @@ namespace OpenSim.Region.Environment.Scenes
747 m_interregionCommsOut = RequestModuleInterface<IInterregionCommsOut>(); 750 m_interregionCommsOut = RequestModuleInterface<IInterregionCommsOut>();
748 m_interregionCommsIn = RequestModuleInterface<IInterregionCommsIn>(); 751 m_interregionCommsIn = RequestModuleInterface<IInterregionCommsIn>();
749 m_dialogModule = RequestModuleInterface<IDialogModule>(); 752 m_dialogModule = RequestModuleInterface<IDialogModule>();
750 CapsModule = RequestModuleInterface<ICapabilitiesModule>(); 753 m_capsModule = RequestModuleInterface<ICapabilitiesModule>();
751 } 754 }
752 755
753 #endregion 756 #endregion
@@ -972,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes
972 /// Perform delegate action on all clients subscribing to updates from this region. 975 /// Perform delegate action on all clients subscribing to updates from this region.
973 /// </summary> 976 /// </summary>
974 /// <returns></returns> 977 /// <returns></returns>
975 internal void Broadcast(Action<IClientAPI> whatToDo) 978 public void Broadcast(Action<IClientAPI> whatToDo)
976 { 979 {
977 ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); }); 980 ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); });
978 } 981 }
@@ -2965,8 +2968,7 @@ namespace OpenSim.Region.Environment.Scenes
2965 IEventQueue eq = RequestModuleInterface<IEventQueue>(); 2968 IEventQueue eq = RequestModuleInterface<IEventQueue>();
2966 if (eq != null) 2969 if (eq != null)
2967 { 2970 {
2968 OSD Item = EventQueueHelper.DisableSimulator(RegionInfo.RegionHandle); 2971 eq.DisableSimulator(RegionInfo.RegionHandle, agentID);
2969 eq.Enqueue(Item, agentID);
2970 } 2972 }
2971 else 2973 else
2972 presence.ControllingClient.SendShutdownConnectionNotice(); 2974 presence.ControllingClient.SendShutdownConnectionNotice();
@@ -3792,12 +3794,12 @@ namespace OpenSim.Region.Environment.Scenes
3792 return m_sceneGraph.GetSceneObjectPart(fullID); 3794 return m_sceneGraph.GetSceneObjectPart(fullID);
3793 } 3795 }
3794 3796
3795 internal bool TryGetAvatar(UUID avatarId, out ScenePresence avatar) 3797 public bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
3796 { 3798 {
3797 return m_sceneGraph.TryGetAvatar(avatarId, out avatar); 3799 return m_sceneGraph.TryGetAvatar(avatarId, out avatar);
3798 } 3800 }
3799 3801
3800 internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar) 3802 public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
3801 { 3803 {
3802 return m_sceneGraph.TryGetAvatarByName(avatarName, out avatar); 3804 return m_sceneGraph.TryGetAvatarByName(avatarName, out avatar);
3803 } 3805 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 5b78617..6d61e9f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -33,9 +33,9 @@ using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37 37
38namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Framework.Scenes
39{ 39{
40 public abstract class SceneBase : IScene 40 public abstract class SceneBase : IScene
41 { 41 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 9935512..a2b2537 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -33,14 +33,13 @@ using System.Threading;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenMetaverse.StructuredData; 34using OpenMetaverse.StructuredData;
35using log4net; 35using log4net;
36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Framework; 36using OpenSim.Framework;
38using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Capabilities; 38using OpenSim.Framework.Communications.Capabilities;
40using OpenSim.Region.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
41using OSD = OpenMetaverse.StructuredData.OSD; 40using OSD = OpenMetaverse.StructuredData.OSD;
42 41
43namespace OpenSim.Region.Environment.Scenes 42namespace OpenSim.Region.Framework.Scenes
44{ 43{
45 public delegate void KiPrimitiveDelegate(uint localID); 44 public delegate void KiPrimitiveDelegate(uint localID);
46 45
@@ -305,13 +304,10 @@ namespace OpenSim.Region.Environment.Scenes
305 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); 304 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
306 if (eq != null) 305 if (eq != null)
307 { 306 {
308 OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, endPoint); 307 eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID);
309 eq.Enqueue(Item, avatar.UUID); 308 eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
310 309 m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}",
311 Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath); 310 capsPath, avatar.UUID, avatar.Scene.RegionInfo.RegionName);
312 eq.Enqueue(Item, avatar.UUID);
313
314 m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}", capsPath, avatar.UUID, avatar.Scene.RegionInfo.RegionName);
315 } 311 }
316 else 312 else
317 { 313 {
@@ -806,16 +802,14 @@ namespace OpenSim.Region.Environment.Scenes
806 802
807 if (eq != null) 803 if (eq != null)
808 { 804 {
809 OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, endPoint); 805 eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID);
810 eq.Enqueue(Item, avatar.UUID);
811 806
812 // ES makes the client send a UseCircuitCode message to the destination, 807 // ES makes the client send a UseCircuitCode message to the destination,
813 // which triggers a bunch of things there. 808 // which triggers a bunch of things there.
814 // So let's wait 809 // So let's wait
815 Thread.Sleep(2000); 810 Thread.Sleep(2000);
816 811
817 Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath); 812 eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
818 eq.Enqueue(Item, avatar.UUID);
819 } 813 }
820 else 814 else
821 { 815 {
@@ -860,9 +854,8 @@ namespace OpenSim.Region.Environment.Scenes
860 854
861 if (eq != null) 855 if (eq != null)
862 { 856 {
863 OSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, endPoint, 857 eq.TeleportFinishEvent(reg.RegionHandle, 13, endPoint,
864 4, teleportFlags, capsPath, avatar.UUID); 858 4, teleportFlags, capsPath, avatar.UUID);
865 eq.Enqueue(Item, avatar.UUID);
866 } 859 }
867 else 860 else
868 { 861 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 24eaad1..2877dcd 100644
--- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -32,10 +32,10 @@ using OpenMetaverse;
32using OpenMetaverse.Packets; 32using OpenMetaverse.Packets;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Types; 35using OpenSim.Region.Framework.Scenes.Types;
36using OpenSim.Region.Physics.Manager; 36using OpenSim.Region.Physics.Manager;
37 37
38namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Framework.Scenes
39{ 39{
40 public delegate void PhysicsCrash(); 40 public delegate void PhysicsCrash();
41 41
@@ -312,7 +312,7 @@ namespace OpenSim.Region.Environment.Scenes
312 /// Delete an object from the scene 312 /// Delete an object from the scene
313 /// </summary> 313 /// </summary>
314 /// <returns>true if the object was deleted, false if there was no object to delete</returns> 314 /// <returns>true if the object was deleted, false if there was no object to delete</returns>
315 protected internal bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked) 315 public bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked)
316 { 316 {
317 if (Entities.ContainsKey(uuid)) 317 if (Entities.ContainsKey(uuid))
318 { 318 {
@@ -797,8 +797,11 @@ namespace OpenSim.Region.Environment.Scenes
797 /// suitable solution). 797 /// suitable solution).
798 /// </summary> 798 /// </summary>
799 /// <param name="agentId"></param> 799 /// <param name="agentId"></param>
800 /// <returns>null if either the avatar wasn't in the scene, or they do not have a controlling client</returns> 800 /// <returns>null if either the avatar wasn't in the scene, or
801 protected internal IClientAPI GetControllingClient(UUID agentId) 801 /// they do not have a controlling client</returns>
802 /// <remarks>this used to be protected internal, but that
803 /// prevents CapabilitiesModule from accessing it</remarks>
804 public IClientAPI GetControllingClient(UUID agentId)
802 { 805 {
803 ScenePresence presence = GetScenePresence(agentId); 806 ScenePresence presence = GetScenePresence(agentId);
804 807
@@ -1034,7 +1037,7 @@ namespace OpenSim.Region.Environment.Scenes
1034 return Entities.GetEntities(); 1037 return Entities.GetEntities();
1035 } 1038 }
1036 1039
1037 protected internal Dictionary<uint, float> GetTopScripts() 1040 public Dictionary<uint, float> GetTopScripts()
1038 { 1041 {
1039 Dictionary<uint, float> topScripts = new Dictionary<uint, float>(); 1042 Dictionary<uint, float> topScripts = new Dictionary<uint, float>();
1040 1043
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index b28eef2..180f8a1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -32,9 +32,9 @@ using System.Reflection;
32using OpenMetaverse; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36 36
37namespace OpenSim.Region.Environment.Scenes 37namespace OpenSim.Region.Framework.Scenes
38{ 38{
39 public delegate void RestartSim(RegionInfo thisregion); 39 public delegate void RestartSim(RegionInfo thisregion);
40 40
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 053e0da..5fa6609 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -31,11 +31,11 @@ using System.Reflection;
31using OpenMetaverse; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using System.Collections.Generic; 35using System.Collections.Generic;
36using System.Xml; 36using System.Xml;
37 37
38namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Framework.Scenes
39{ 39{
40 public partial class SceneObjectGroup : EntityBase 40 public partial class SceneObjectGroup : EntityBase
41 { 41 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 5ae95ee..57d9ce4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -34,10 +34,10 @@ using System.Xml.Serialization;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenMetaverse.Packets; 35using OpenMetaverse.Packets;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Physics.Manager; 38using OpenSim.Region.Physics.Manager;
39 39
40namespace OpenSim.Region.Environment.Scenes 40namespace OpenSim.Region.Framework.Scenes
41{ 41{
42 [Flags] 42 [Flags]
43 public enum scriptEvents 43 public enum scriptEvents
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 256d6f8..dfa9318 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -37,11 +37,11 @@ using log4net;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenMetaverse.Packets; 38using OpenMetaverse.Packets;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Environment.Scenes.Scripting; 41using OpenSim.Region.Framework.Scenes.Scripting;
42using OpenSim.Region.Physics.Manager; 42using OpenSim.Region.Physics.Manager;
43 43
44namespace OpenSim.Region.Environment.Scenes 44namespace OpenSim.Region.Framework.Scenes
45{ 45{
46 #region Enumerations 46 #region Enumerations
47 47
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 8137a53..efd486d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -32,11 +32,10 @@ using OpenMetaverse;
32using log4net; 32using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Scenes.Scripting;
37using OpenSim.Region.Environment.Scenes.Scripting;
38 37
39namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Framework.Scenes
40{ 39{
41 public class SceneObjectPartInventory : IEntityInventory 40 public class SceneObjectPartInventory : IEntityInventory
42 { 41 {
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ed455f4..36cd862 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -36,13 +36,12 @@ using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Client; 37using OpenSim.Framework.Client;
38using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Types; 40using OpenSim.Region.Framework.Scenes.Types;
41using OpenSim.Region.Interfaces;
42using OpenSim.Region.Physics.Manager; 41using OpenSim.Region.Physics.Manager;
43using OSD = OpenMetaverse.StructuredData.OSD; 42using OSD = OpenMetaverse.StructuredData.OSD;
44 43
45namespace OpenSim.Region.Environment.Scenes 44namespace OpenSim.Region.Framework.Scenes
46{ 45{
47 enum ScriptControlled : uint 46 enum ScriptControlled : uint
48 { 47 {
@@ -2474,10 +2473,9 @@ namespace OpenSim.Region.Environment.Scenes
2474 2473
2475 IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>(); 2474 IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>();
2476 if (eq != null) 2475 if (eq != null)
2477 { 2476 {
2478 OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, 2477 eq.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
2479 capsPath, UUID, ControllingClient.SessionId); 2478 capsPath, UUID, ControllingClient.SessionId);
2480 eq.Enqueue(Item, UUID);
2481 } 2479 }
2482 else 2480 else
2483 { 2481 {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
index 2e9c551..7d9d247 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
@@ -35,7 +35,7 @@ using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Physics.Manager; 36using OpenSim.Region.Physics.Manager;
37 37
38namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Framework.Scenes
39{ 39{
40 /// <summary> 40 /// <summary>
41 /// Static methods to serialize and deserialize scene objects to and from XML 41 /// 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
index 152825f..440820b 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs
@@ -27,7 +27,7 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29 29
30namespace OpenSim.Region.Environment.Scenes.Scripting 30namespace OpenSim.Region.Framework.Scenes.Scripting
31{ 31{
32 public interface IScriptHost 32 public interface IScriptHost
33 { 33 {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
index 37f5d43..fd7ff96 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30 30
31namespace OpenSim.Region.Environment.Scenes.Scripting 31namespace OpenSim.Region.Framework.Scenes.Scripting
32{ 32{
33 public class NullScriptHost : IScriptHost 33 public class NullScriptHost : IScriptHost
34 { 34 {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineInterface.cs
index b1ee519..d358187 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineInterface.cs
@@ -27,7 +27,7 @@
27 27
28//TODO: WHERE TO PLACE THIS? 28//TODO: WHERE TO PLACE THIS?
29 29
30namespace OpenSim.Region.Environment.Scenes.Scripting 30namespace OpenSim.Region.Framework.Scenes.Scripting
31{ 31{
32 public interface ScriptEngineInterface 32 public interface ScriptEngineInterface
33 { 33 {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
index 6216e2c..58228cc 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
@@ -31,7 +31,7 @@ using System.IO;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33 33
34namespace OpenSim.Region.Environment.Scenes.Scripting 34namespace OpenSim.Region.Framework.Scenes.Scripting
35{ 35{
36 public class ScriptEngineLoader 36 public class ScriptEngineLoader
37 { 37 {
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index efda140..b2cea5d 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -31,9 +31,9 @@ using System.Timers;
31using OpenMetaverse.Packets; 31using OpenMetaverse.Packets;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Statistics; 33using OpenSim.Framework.Statistics;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35 35
36namespace OpenSim.Region.Environment.Scenes 36namespace OpenSim.Region.Framework.Scenes
37{ 37{
38 public class SimStatsReporter 38 public class SimStatsReporter
39 { 39 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 1534c4b..55c5181 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -26,14 +26,14 @@
26 */ 26 */
27 27
28using OpenSim.Framework; 28using OpenSim.Framework;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using System; 30using System;
31using System.Text; 31using System.Text;
32using System.Xml; 32using System.Xml;
33using System.IO; 33using System.IO;
34using System.Xml.Serialization; 34using System.Xml.Serialization;
35 35
36namespace OpenSim.Region.Environment.Modules.World.Terrain 36namespace OpenSim.Region.Framework.Scenes
37{ 37{
38 /// <summary> 38 /// <summary>
39 /// A new version of the old Channel class, simplified 39 /// 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
index b20ff42..318a682 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainUtil.cs
@@ -26,9 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Terrain 31namespace OpenSim.Region.Framework.Scenes
32{ 32{
33 public static class TerrainUtil 33 public static class TerrainUtil
34 { 34 {
diff --git a/OpenSim/Region/Environment/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index 0155966..2c6ccc8 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;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Tests.Common.Setup; 39using OpenSim.Tests.Common.Setup;
40 40
41namespace OpenSim.Region.Environment.Scenes.Tests 41namespace OpenSim.Region.Framework.Scenes.Tests
42{ 42{
43 [TestFixture] 43 [TestFixture]
44 public class EntityManagerTests 44 public class EntityManagerTests
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index d063eae..d063eae 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/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
index 30b0987..30b0987 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/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
index d66c365..dc8df32 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;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Modules.Communications.Local; 39using OpenSim.Region.Environment.Modules.Communications.Local;
40using OpenSim.Region.Environment.Modules.World.Serialiser; 40using OpenSim.Region.Environment.Modules.World.Serialiser;
41using OpenSim.Tests.Common.Mock; 41using OpenSim.Tests.Common.Mock;
42using OpenSim.Tests.Common.Setup; 42using OpenSim.Tests.Common.Setup;
43 43
44namespace OpenSim.Region.Environment.Scenes.Tests 44namespace OpenSim.Region.Framework.Scenes.Tests
45{ 45{
46 /// <summary> 46 /// <summary>
47 /// Scene presence tests 47 /// Scene presence tests
diff --git a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 221d97f..a78faa6 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -32,12 +32,12 @@ using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
34using OpenSim.Region.Environment; 34using OpenSim.Region.Environment;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Modules.Communications.REST; 36using OpenSim.Region.Environment.Modules.Communications.REST;
37using OpenSim.Tests.Common.Mock; 37using OpenSim.Tests.Common.Mock;
38using OpenSim.Tests.Common.Setup; 38using OpenSim.Tests.Common.Setup;
39 39
40namespace OpenSim.Region.Environment.Scenes.Tests 40namespace OpenSim.Region.Framework.Scenes.Tests
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// Teleport tests in a standalone OpenSim 43 /// Teleport tests in a standalone OpenSim
diff --git a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
index 24ce94b..9fbbb15 100644
--- a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
@@ -27,9 +27,9 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Types 32namespace OpenSim.Region.Framework.Scenes.Types
33{ 33{
34 public class BasicQuadTreeNode 34 public class BasicQuadTreeNode
35 { 35 {
diff --git a/OpenSim/Region/Environment/Types/UpdateQueue.cs b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
index 0c86df2..452ada9 100644
--- a/OpenSim/Region/Environment/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
30using System.Runtime.Serialization; 30using System.Runtime.Serialization;
31using System.Security.Permissions; 31using System.Security.Permissions;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Framework.Scenes;
34 34
35namespace OpenSim.Region.Environment.Types 35namespace OpenSim.Region.Framework.Scenes.Types
36{ 36{
37 [Serializable] 37 [Serializable]
38 public class UpdateQueue : ISerializable 38 public class UpdateQueue : ISerializable
diff --git a/OpenSim/Region/Environment/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index d828d8d..3d48229 100644
--- a/OpenSim/Region/Environment/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -27,7 +27,7 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29 29
30namespace OpenSim.Region.Environment.Scenes 30namespace OpenSim.Region.Framework.Scenes
31{ 31{
32 public class UndoState 32 public class UndoState
33 { 33 {
diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Framework/StorageManager.cs
index c9057f2..db9359f 100644
--- a/OpenSim/Region/Environment/StorageManager.cs
+++ b/OpenSim/Region/Framework/StorageManager.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using log4net; 30using log4net;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Environment 33namespace OpenSim.Region.Framework
34{ 34{
35 public class StorageManager 35 public class StorageManager
36 { 36 {
diff --git a/OpenSim/Region/Modules/Python/PythonModule.cs b/OpenSim/Region/Modules/Python/PythonModule.cs
index d86f830..5dedac2 100644
--- a/OpenSim/Region/Modules/Python/PythonModule.cs
+++ b/OpenSim/Region/Modules/Python/PythonModule.cs
@@ -33,8 +33,8 @@ using System.Text;
33using IronPython.Hosting; 33using IronPython.Hosting;
34using log4net; 34using log4net;
35using Nini.Config; 35using Nini.Config;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.Modules.Python 39namespace OpenSim.Region.Modules.Python
40{ 40{
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
index ea389d6..6e3b620 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
@@ -32,10 +32,10 @@ using System.Reflection;
32using System.Timers; 32using System.Timers;
33using log4net; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Modules.World.Serialiser; 36using OpenSim.Region.Environment.Modules.World.Serialiser;
37using OpenSim.Region.Environment.Modules.World.Terrain; 37using OpenSim.Region.Environment.Modules.World.Terrain;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using PumaCode.SvnDotNet.AprSharp; 39using PumaCode.SvnDotNet.AprSharp;
40using PumaCode.SvnDotNet.SubversionSharp; 40using PumaCode.SvnDotNet.SubversionSharp;
41using Slash=System.IO.Path; 41using Slash=System.IO.Path;
diff --git a/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs b/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs
index 6c860e7..8dd7478 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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Environment.Modules.World.Terrain; 30using OpenSim.Region.Environment.Modules.World.Terrain;
31using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes; 31using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
32 32
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index 09dbc40..7eb00a7 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -31,10 +31,9 @@ using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; 32using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
33using OpenSim.Region.Environment; 33using OpenSim.Region.Environment;
34using OpenSim.Region.Interfaces;
35using OpenSim.Region; 34using OpenSim.Region;
36using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
37using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.ScriptEngine.Shared; 37using OpenSim.Region.ScriptEngine.Shared;
39 38
40namespace OpenSim.Region.ScriptEngine.DotNetEngine 39namespace OpenSim.Region.ScriptEngine.DotNetEngine
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
index 5ac57c2..01cbb72 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
@@ -35,8 +35,8 @@ using System.Globalization;
35using OpenMetaverse; 35using OpenMetaverse;
36using log4net; 36using log4net;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Environment.Scenes.Scripting; 39using OpenSim.Region.Framework.Scenes.Scripting;
40using OpenSim.Region.ScriptEngine.Shared; 40using OpenSim.Region.ScriptEngine.Shared;
41using OpenSim.Region.ScriptEngine.Shared.CodeTools; 41using OpenSim.Region.ScriptEngine.Shared.CodeTools;
42 42
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 28e1278..f1f5f4b 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -30,11 +30,10 @@ using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using log4net; 31using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Region.Interfaces;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Region.Environment; 34using OpenSim.Region.Environment;
36using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.ScriptEngine.Interfaces; 37using OpenSim.Region.ScriptEngine.Interfaces;
39using OpenMetaverse; 38using OpenMetaverse;
40using OpenMetaverse.StructuredData; 39using OpenMetaverse.StructuredData;
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 2631867..3de3aad 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -33,7 +33,7 @@ using System.Runtime.Remoting.Lifetime;
33using log4net; 33using log4net;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Region.ScriptEngine.Interfaces; 37using OpenSim.Region.ScriptEngine.Interfaces;
38using OpenSim.Region.ScriptEngine.Shared; 38using OpenSim.Region.ScriptEngine.Shared;
39using OpenSim.Region.ScriptEngine.Shared.Api; 39using OpenSim.Region.ScriptEngine.Shared.Api;
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
index e94de68..707a7f7 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32 32
33namespace OpenSim.Region.ScriptEngine.Interfaces 33namespace OpenSim.Region.ScriptEngine.Interfaces
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
index 04af705..84baa64 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
@@ -28,7 +28,7 @@
28using log4net; 28using log4net;
29using System; 29using System;
30using OpenSim.Region.ScriptEngine.Shared; 30using OpenSim.Region.ScriptEngine.Shared;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Framework.Scenes;
32using OpenMetaverse; 32using OpenMetaverse;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Region.ScriptEngine.Interfaces; 34using 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 71a8d0f..cc71bab 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;
31using System.Threading; 31using System.Threading;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.ScriptEngine.Interfaces; 35using OpenSim.Region.ScriptEngine.Interfaces;
36using OpenSim.Region.ScriptEngine.Shared; 36using OpenSim.Region.ScriptEngine.Shared;
37using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; 37using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
@@ -234,8 +234,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
234 m_Timer[engine].UnSetTimerEvents(localID, itemID); 234 m_Timer[engine].UnSetTimerEvents(localID, itemID);
235 235
236 // Remove from: HttpRequest 236 // Remove from: HttpRequest
237 IHttpRequests iHttpReq = 237 IHttpRequestModule iHttpReq =
238 engine.World.RequestModuleInterface<IHttpRequests>(); 238 engine.World.RequestModuleInterface<IHttpRequestModule>();
239 iHttpReq.StopHttpRequest(localID, itemID); 239 iHttpReq.StopHttpRequest(localID, itemID);
240 240
241 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>(); 241 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7564c69..1484638 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;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Region.Environment; 40using OpenSim.Region.Environment;
41using OpenSim.Region.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.Environment.Interfaces;
43using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; 42using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
44using OpenSim.Region.Environment.Modules.World.Land; 43using OpenSim.Region.Environment.Modules.World.Land;
45using OpenSim.Region.Environment.Modules.World.Terrain; 44using OpenSim.Region.Environment.Modules.World.Terrain;
46using OpenSim.Region.Environment.Scenes; 45using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Physics.Manager; 46using OpenSim.Region.Physics.Manager;
48using OpenSim.Region.ScriptEngine.Shared; 47using OpenSim.Region.ScriptEngine.Shared;
49using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; 48using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
@@ -8454,8 +8453,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8454 // in StartHttpRequest 8453 // in StartHttpRequest
8455 8454
8456 m_host.AddScriptLPS(1); 8455 m_host.AddScriptLPS(1);
8457 IHttpRequests httpScriptMod = 8456 IHttpRequestModule httpScriptMod =
8458 m_ScriptEngine.World.RequestModuleInterface<IHttpRequests>(); 8457 m_ScriptEngine.World.RequestModuleInterface<IHttpRequestModule>();
8459 List<string> param = new List<string>(); 8458 List<string> param = new List<string>();
8460 foreach (object o in parameters.Data) 8459 foreach (object o in parameters.Data)
8461 { 8460 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 734b3ef..fa09b0a 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;
35using OpenSim; 35using OpenSim;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Region.ScriptEngine.Shared; 40using OpenSim.Region.ScriptEngine.Shared;
41using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; 41using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
42using OpenSim.Region.ScriptEngine.Shared.ScriptBase; 42using 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 f5a965b..4c7dc8d 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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Environment.Modules.Scripting.HttpRequest; 30using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
31using OpenSim.Region.ScriptEngine.Shared; 31using OpenSim.Region.ScriptEngine.Shared;
32using OpenSim.Region.ScriptEngine.Interfaces; 32using OpenSim.Region.ScriptEngine.Interfaces;
@@ -48,13 +48,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
48 if (m_CmdManager.m_ScriptEngine.World == null) 48 if (m_CmdManager.m_ScriptEngine.World == null)
49 return; 49 return;
50 50
51 IHttpRequests iHttpReq = 51 IHttpRequestModule iHttpReq =
52 m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IHttpRequests>(); 52 m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IHttpRequestModule>();
53 53
54 HttpRequestClass httpInfo = null; 54 HttpRequestClass httpInfo = null;
55 55
56 if (iHttpReq != null) 56 if (iHttpReq != null)
57 httpInfo = iHttpReq.GetNextCompletedRequest(); 57 httpInfo = (HttpRequestClass)iHttpReq.GetNextCompletedRequest();
58 58
59 while (httpInfo != null) 59 while (httpInfo != null)
60 { 60 {
@@ -67,24 +67,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
67 // implemented here yet anyway. Should be fixed if/when maxsize 67 // implemented here yet anyway. Should be fixed if/when maxsize
68 // is supported 68 // is supported
69 69
70 iHttpReq.RemoveCompletedRequest(httpInfo.reqID); 70 iHttpReq.RemoveCompletedRequest(httpInfo.ReqID);
71 71
72 object[] resobj = new object[] 72 object[] resobj = new object[]
73 { 73 {
74 new LSL_Types.LSLString(httpInfo.reqID.ToString()), 74 new LSL_Types.LSLString(httpInfo.ReqID.ToString()),
75 new LSL_Types.LSLInteger(httpInfo.status), 75 new LSL_Types.LSLInteger(httpInfo.Status),
76 new LSL_Types.list(), 76 new LSL_Types.list(),
77 new LSL_Types.LSLString(httpInfo.response_body) 77 new LSL_Types.LSLString(httpInfo.ResponseBody)
78 }; 78 };
79 79
80 foreach (IScriptEngine e in m_CmdManager.ScriptEngines) 80 foreach (IScriptEngine e in m_CmdManager.ScriptEngines)
81 { 81 {
82 if (e.PostObjectEvent(httpInfo.localID, 82 if (e.PostObjectEvent(httpInfo.LocalID,
83 new EventParams("http_response", 83 new EventParams("http_response",
84 resobj, new DetectParams[0]))) 84 resobj, new DetectParams[0])))
85 break; 85 break;
86 } 86 }
87 httpInfo = iHttpReq.GetNextCompletedRequest(); 87 httpInfo = (HttpRequestClass)iHttpReq.GetNextCompletedRequest();
88 } 88 }
89 } 89 }
90 } 90 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
index b72d17c..eba52bf 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 @@
27 27
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Region.Environment.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Environment.Modules.Scripting.WorldComm; 31using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
32using OpenSim.Region.ScriptEngine.Interfaces; 32using OpenSim.Region.ScriptEngine.Interfaces;
33using OpenSim.Region.ScriptEngine.Shared; 33using OpenSim.Region.ScriptEngine.Shared;
@@ -56,7 +56,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
56 { 56 {
57 while (comms.HasMessages()) 57 while (comms.HasMessages())
58 { 58 {
59 ListenerInfo lInfo = comms.GetNextMessage(); 59 ListenerInfo lInfo = (ListenerInfo)comms.GetNextMessage();
60 60
61 //Deliver data to prim's listen handler 61 //Deliver data to prim's listen handler
62 object[] resobj = new object[] 62 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 808d880..f132518 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;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.ScriptEngine.Shared; 34using OpenSim.Region.ScriptEngine.Shared;
35using OpenSim.Region.ScriptEngine.Shared.Api; 35using OpenSim.Region.ScriptEngine.Shared.Api;
36 36
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
index a7699a1..bf1a923 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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; 30using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
31using OpenSim.Region.ScriptEngine.Interfaces; 31using OpenSim.Region.ScriptEngine.Interfaces;
32using OpenSim.Region.ScriptEngine.Shared; 32using OpenSim.Region.ScriptEngine.Shared;
@@ -52,7 +52,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
52 52
53 if (xmlrpc != null) 53 if (xmlrpc != null)
54 { 54 {
55 RPCRequestInfo rInfo = xmlrpc.GetNextCompletedRequest(); 55 RPCRequestInfo rInfo = (RPCRequestInfo)xmlrpc.GetNextCompletedRequest();
56 56
57 while (rInfo != null) 57 while (rInfo != null)
58 { 58 {
@@ -80,10 +80,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
80 break; 80 break;
81 } 81 }
82 82
83 rInfo = xmlrpc.GetNextCompletedRequest(); 83 rInfo = (RPCRequestInfo)xmlrpc.GetNextCompletedRequest();
84 } 84 }
85 85
86 SendRemoteDataRequest srdInfo = xmlrpc.GetNextCompletedSRDRequest(); 86 SendRemoteDataRequest srdInfo = (SendRemoteDataRequest)xmlrpc.GetNextCompletedSRDRequest();
87 87
88 while (srdInfo != null) 88 while (srdInfo != null)
89 { 89 {
@@ -93,23 +93,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
93 object[] resobj = new object[] 93 object[] resobj = new object[]
94 { 94 {
95 new LSL_Types.LSLInteger(3), 95 new LSL_Types.LSLInteger(3),
96 new LSL_Types.LSLString(srdInfo.channel.ToString()), 96 new LSL_Types.LSLString(srdInfo.Channel.ToString()),
97 new LSL_Types.LSLString(srdInfo.GetReqID().ToString()), 97 new LSL_Types.LSLString(srdInfo.GetReqID().ToString()),
98 new LSL_Types.LSLString(String.Empty), 98 new LSL_Types.LSLString(String.Empty),
99 new LSL_Types.LSLInteger(srdInfo.idata), 99 new LSL_Types.LSLInteger(srdInfo.Idata),
100 new LSL_Types.LSLString(srdInfo.sdata) 100 new LSL_Types.LSLString(srdInfo.Sdata)
101 }; 101 };
102 102
103 foreach (IScriptEngine e in m_CmdManager.ScriptEngines) 103 foreach (IScriptEngine e in m_CmdManager.ScriptEngines)
104 { 104 {
105 if (e.PostScriptEvent( 105 if (e.PostScriptEvent(
106 srdInfo.m_itemID, new EventParams( 106 srdInfo.ItemID, new EventParams(
107 "remote_data", resobj, 107 "remote_data", resobj,
108 new DetectParams[0]))) 108 new DetectParams[0])))
109 break; 109 break;
110 } 110 }
111 111
112 srdInfo = xmlrpc.GetNextCompletedSRDRequest(); 112 srdInfo = (SendRemoteDataRequest)xmlrpc.GetNextCompletedSRDRequest();
113 } 113 }
114 } 114 }
115 } 115 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 3817a07..ceb0f37 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;
31using System.Reflection; 31using System.Reflection;
32using System.Collections; 32using System.Collections;
33using System.Collections.Generic; 33using System.Collections.Generic;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.ScriptEngine.Interfaces; 35using OpenSim.Region.ScriptEngine.Interfaces;
36using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; 36using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
37using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; 37using 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 708afab..3cd6b76 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 @@
34 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" /> 34 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" />
35 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Console" /> 35 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Console" />
36 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Environment" /> 36 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Environment" />
37 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Framework" />
37 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.ScriptEngine.Shared" /> 38 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.ScriptEngine.Shared" />
38 <ProjectReference type="Assembly" refto="../../../../../../bin/RAIL.dll" localcopy="False" /> 39 <ProjectReference type="Assembly" refto="../../../../../../bin/RAIL.dll" localcopy="False" />
39 <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 40 <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 195f48a..0f4e7e5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -33,7 +33,7 @@ using System.IO;
33using Microsoft.CSharp; 33using Microsoft.CSharp;
34using Microsoft.JScript; 34using Microsoft.JScript;
35using Microsoft.VisualBasic; 35using Microsoft.VisualBasic;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.ScriptEngine.Interfaces; 37using OpenSim.Region.ScriptEngine.Interfaces;
38 38
39namespace OpenSim.Region.ScriptEngine.Shared.CodeTools 39namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index b9ff0cd..777cb12 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -34,7 +34,7 @@ using System.Runtime.Serialization;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment; 36using OpenSim.Region.Environment;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.ScriptEngine.Shared 39namespace OpenSim.Region.ScriptEngine.Shared
40{ 40{
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index f808f12..6b04248 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -42,8 +42,8 @@ using Nini.Config;
42using Amib.Threading; 42using Amib.Threading;
43using OpenSim.Framework; 43using OpenSim.Framework;
44using OpenSim.Region.Environment; 44using OpenSim.Region.Environment;
45using OpenSim.Region.Environment.Scenes; 45using OpenSim.Region.Framework.Scenes;
46using OpenSim.Region.Environment.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.ScriptEngine.Shared; 47using OpenSim.Region.ScriptEngine.Shared;
48using OpenSim.Region.ScriptEngine.Shared.Api; 48using OpenSim.Region.ScriptEngine.Shared.Api;
49using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; 49using 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 c06960b..7e8d690 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
@@ -40,8 +40,8 @@ using Nini.Config;
40using Amib.Threading; 40using Amib.Threading;
41using OpenSim.Framework; 41using OpenSim.Framework;
42using OpenSim.Region.Environment; 42using OpenSim.Region.Environment;
43using OpenSim.Region.Environment.Scenes; 43using OpenSim.Region.Framework.Scenes;
44using OpenSim.Region.Environment.Interfaces; 44using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.ScriptEngine.Shared; 45using OpenSim.Region.ScriptEngine.Shared;
46using OpenSim.Region.ScriptEngine.Shared.Api; 46using OpenSim.Region.ScriptEngine.Shared.Api;
47using OpenSim.Region.ScriptEngine.Shared.ScriptBase; 47using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 8355b60..09f751f 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -31,9 +31,8 @@ using System.Collections.Generic;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; 33using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
34using OpenSim.Region.Interfaces; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.ScriptEngine.Shared; 36using OpenSim.Region.ScriptEngine.Shared;
38using OpenSim.Region.ScriptEngine.Interfaces; 37using OpenSim.Region.ScriptEngine.Interfaces;
39 38
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index f0f867b..2cb18ea 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -41,10 +41,9 @@ using log4net;
41using Nini.Config; 41using Nini.Config;
42using Amib.Threading; 42using Amib.Threading;
43using OpenSim.Framework; 43using OpenSim.Framework;
44using OpenSim.Region.Interfaces;
45using OpenSim.Region.Environment; 44using OpenSim.Region.Environment;
46using OpenSim.Region.Environment.Scenes; 45using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Environment.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.ScriptEngine.Shared; 47using OpenSim.Region.ScriptEngine.Shared;
49using OpenSim.Region.ScriptEngine.Shared.ScriptBase; 48using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
50using OpenSim.Region.ScriptEngine.Shared.CodeTools; 49using OpenSim.Region.ScriptEngine.Shared.CodeTools;
diff --git a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs b/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs
index bbaaf44..a20e70f 100644
--- a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs
+++ b/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs
@@ -32,7 +32,7 @@ using System.Reflection;
32using System.Text; 32using System.Text;
33using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Framework.Statistics; 36using OpenSim.Framework.Statistics;
37 37
38namespace OpenSim.Region.UserStatistics 38namespace OpenSim.Region.UserStatistics
diff --git a/OpenSim/Region/UserStatistics/Clients_report.cs b/OpenSim/Region/UserStatistics/Clients_report.cs
index 69514fb..b2bb33b 100644
--- a/OpenSim/Region/UserStatistics/Clients_report.cs
+++ b/OpenSim/Region/UserStatistics/Clients_report.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using Mono.Data.SqliteClient; 32using Mono.Data.SqliteClient;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.UserStatistics 36namespace OpenSim.Region.UserStatistics
37{ 37{
diff --git a/OpenSim/Region/UserStatistics/Default_Report.cs b/OpenSim/Region/UserStatistics/Default_Report.cs
index 55cb454..668fd45 100644
--- a/OpenSim/Region/UserStatistics/Default_Report.cs
+++ b/OpenSim/Region/UserStatistics/Default_Report.cs
@@ -32,7 +32,7 @@ using System.Reflection;
32using System.Text; 32using System.Text;
33using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Framework.Statistics; 36using OpenSim.Framework.Statistics;
37 37
38 38
diff --git a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs b/OpenSim/Region/UserStatistics/LogLinesAJAX.cs
index 1f55d51..85d2e03 100644
--- a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs
+++ b/OpenSim/Region/UserStatistics/LogLinesAJAX.cs
@@ -33,7 +33,7 @@ using System.Text;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using Mono.Data.SqliteClient; 34using Mono.Data.SqliteClient;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Framework.Statistics; 37using OpenSim.Framework.Statistics;
38 38
39namespace OpenSim.Region.UserStatistics 39namespace OpenSim.Region.UserStatistics
diff --git a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
index be213aa..8c04e71 100644
--- a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
+++ b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
@@ -32,7 +32,7 @@ using System.Reflection;
32using System.Text; 32using System.Text;
33using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Framework.Statistics; 36using OpenSim.Framework.Statistics;
37 37
38namespace OpenSim.Region.UserStatistics 38namespace OpenSim.Region.UserStatistics
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index cb3b292..e718560 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -39,8 +39,8 @@ using OpenMetaverse;
39using OpenMetaverse.StructuredData; 39using OpenMetaverse.StructuredData;
40using OpenSim.Framework; 40using OpenSim.Framework;
41using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Region.Environment.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Environment.Scenes; 43using OpenSim.Region.Framework.Scenes;
44using Mono.Data.SqliteClient; 44using Mono.Data.SqliteClient;
45 45
46 46
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs
index 0641613..a3bfebf 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;
29using System.Text; 29using System.Text;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Region.ScriptEngine.Shared; 33using OpenSim.Region.ScriptEngine.Shared;
34using OpenSim.ScriptEngine.Shared; 34using OpenSim.ScriptEngine.Shared;
35using EventParams=OpenSim.ScriptEngine.Shared.EventParams; 35using EventParams = OpenSim.ScriptEngine.Shared.EventParams;
36 36
37namespace OpenSim.ScriptEngine.Components.DotNetEngine.Events 37namespace OpenSim.ScriptEngine.Components.DotNetEngine.Events
38{ 38{
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs
index e70cb91..dd72dbf 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;
34using log4net; 34using log4net;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.ScriptEngine.Interfaces; 38using OpenSim.Region.ScriptEngine.Interfaces;
39using OpenSim.Region.ScriptEngine.Shared.ScriptBase; 39using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
40using OpenSim.ScriptEngine.Shared; 40using OpenSim.ScriptEngine.Shared;
diff --git a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs b/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs
index 3666ca4..d883e2f 100644
--- a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs
+++ b/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs
@@ -33,8 +33,8 @@ using log4net;
33using Nini.Config; 33using Nini.Config;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.ApplicationPlugins.ScriptEngine; 35using OpenSim.ApplicationPlugins.ScriptEngine;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.ScriptEngine.Components.DotNetEngine.Events; 38using OpenSim.ScriptEngine.Components.DotNetEngine.Events;
39using OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler; 39using OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler;
40using OpenSim.ScriptEngine.Shared; 40using OpenSim.ScriptEngine.Shared;
diff --git a/OpenSim/ScriptEngine/Shared/IScriptEngine.cs b/OpenSim/ScriptEngine/Shared/IScriptEngine.cs
index 6148d8d..9e7bd0c 100644
--- a/OpenSim/ScriptEngine/Shared/IScriptEngine.cs
+++ b/OpenSim/ScriptEngine/Shared/IScriptEngine.cs
@@ -28,8 +28,8 @@ using System;
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Text; 29using System.Text;
30using Nini.Config; 30using Nini.Config;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Framework.Scenes;
33 33
34namespace OpenSim.ScriptEngine.Shared 34namespace OpenSim.ScriptEngine.Shared
35{ 35{
diff --git a/OpenSim/ScriptEngine/Shared/RegionInfoStructure.cs b/OpenSim/ScriptEngine/Shared/RegionInfoStructure.cs
index b450f31..693f38c 100644
--- a/OpenSim/ScriptEngine/Shared/RegionInfoStructure.cs
+++ b/OpenSim/ScriptEngine/Shared/RegionInfoStructure.cs
@@ -30,10 +30,10 @@ using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using log4net; 31using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.ScriptEngine.Shared; 34using OpenSim.Region.ScriptEngine.Shared;
35using OpenSim.ScriptEngine.Shared; 35using OpenSim.ScriptEngine.Shared;
36using EventParams=OpenSim.ScriptEngine.Shared.EventParams; 36using EventParams = OpenSim.ScriptEngine.Shared.EventParams;
37 37
38namespace OpenSim.ScriptEngine.Shared 38namespace OpenSim.ScriptEngine.Shared
39{ 39{
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index f899375..5f02524 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -33,8 +33,8 @@ using log4net;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenMetaverse.Packets; 34using OpenMetaverse.Packets;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Tests.Common.Mock 39namespace OpenSim.Tests.Common.Mock
40{ 40{
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 5e9b9ff..761ef44 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -28,7 +28,7 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Tests.Common.Mock 33namespace OpenSim.Tests.Common.Mock
34{ 34{
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 04b3e74..00920c8 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -30,8 +30,8 @@ using OpenSim.Framework;
30using OpenSim.Framework.Communications; 30using OpenSim.Framework.Communications;
31using OpenSim.Framework.Communications.Cache; 31using OpenSim.Framework.Communications.Cache;
32using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
33using OpenSim.Region.Environment; 33using OpenSim.Region.Framework;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Tests.Common.Mock 36namespace OpenSim.Tests.Common.Mock
37{ 37{
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 61c2e5e..5540141 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -33,10 +33,10 @@ using OpenSim.Framework.Communications;
33using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
35using OpenSim.Region.Physics.Manager; 35using OpenSim.Region.Physics.Manager;
36using OpenSim.Region.Environment; 36using OpenSim.Region.Framework;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Environment.Modules.Agent.Capabilities; 39using OpenSim.Region.Environment.Modules.Agent.Capabilities;
39using OpenSim.Region.Environment.Scenes;
40using OpenSim.Tests.Common.Mock; 40using OpenSim.Tests.Common.Mock;
41 41
42namespace OpenSim.Tests.Common.Setup 42namespace OpenSim.Tests.Common.Setup
diff --git a/prebuild.xml b/prebuild.xml
index a88b332..5e8495e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -506,7 +506,7 @@
506 </Files> 506 </Files>
507 </Project> 507 </Project>
508 508
509 <Project name="OpenSim.Region.Interfaces" path="OpenSim/Region/Interfaces" type="Library"> 509 <Project name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
510 <Configuration name="Debug"> 510 <Configuration name="Debug">
511 <Options> 511 <Options>
512 <OutputPath>../../../bin/</OutputPath> 512 <OutputPath>../../../bin/</OutputPath>
@@ -519,19 +519,33 @@
519 </Configuration> 519 </Configuration>
520 520
521 <ReferencePath>../../../bin/</ReferencePath> 521 <ReferencePath>../../../bin/</ReferencePath>
522 <Reference name="System" localCopy="false"/> 522 <Reference name="System"/>
523 <Reference name="System.Runtime.Remoting"/> 523 <Reference name="System.Xml"/>
524 <Reference name="System.Web"/>
524 <Reference name="OpenSim.Framework"/> 525 <Reference name="OpenSim.Framework"/>
525 <Reference name="OpenMetaverse.StructuredData.dll"/> 526 <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/>
527 <Reference name="OpenSim.Data" />
528 <Reference name="OpenSim.Framework.Servers"/>
529 <Reference name="OpenSim.Framework.Console"/>
530 <Reference name="OpenSim.Framework.Statistics"/>
531 <Reference name="OpenSim.Region.Framework"/>
526 <Reference name="OpenMetaverseTypes.dll"/> 532 <Reference name="OpenMetaverseTypes.dll"/>
533 <Reference name="OpenMetaverse.StructuredData.dll"/>
534 <!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code -->
535 <Reference name="OpenMetaverse.dll"/>
536 <Reference name="Nini.dll" />
537 <Reference name="XMLRPC.dll"/>
538 <Reference name="log4net.dll"/>
539 <Reference name="GlynnTucker.Cache.dll"/>
527 540
528 <Files> 541 <Files>
529 <Match pattern="*.cs" recurse="true"/> 542 <Match pattern="*.cs" recurse="true">
543 <Exclude name="Tests" pattern="Tests"/>
544 </Match>
530 </Files> 545 </Files>
531 </Project> 546 </Project>
532 547
533 <!-- OpenSim.Framework.Communications --> 548 <Project name="OpenSim.Region.Framework" path="OpenSim/Region/Framework" type="Library">
534 <Project name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
535 <Configuration name="Debug"> 549 <Configuration name="Debug">
536 <Options> 550 <Options>
537 <OutputPath>../../../bin/</OutputPath> 551 <OutputPath>../../../bin/</OutputPath>
@@ -544,32 +558,41 @@
544 </Configuration> 558 </Configuration>
545 559
546 <ReferencePath>../../../bin/</ReferencePath> 560 <ReferencePath>../../../bin/</ReferencePath>
547 <Reference name="System"/> 561 <Reference name="System" localCopy="false"/>
548 <Reference name="System.Xml"/> 562 <Reference name="System.Xml"/>
563 <Reference name="System.Drawing"/>
564 <Reference name="System.Runtime.Remoting"/>
549 <Reference name="System.Web"/> 565 <Reference name="System.Web"/>
566 <Reference name="OpenMetaverseTypes.dll"/>
567 <Reference name="OpenMetaverse.StructuredData.dll"/>
568 <Reference name="OpenMetaverse.dll"/>
550 <Reference name="OpenSim.Framework"/> 569 <Reference name="OpenSim.Framework"/>
551 <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/> 570 <Reference name="OpenSim.Framework.Communications"/>
552 <Reference name="OpenSim.Data" /> 571 <Reference name="OpenSim.Data" />
553 <Reference name="OpenSim.Framework.Servers"/>
554 <Reference name="OpenSim.Framework.Console"/> 572 <Reference name="OpenSim.Framework.Console"/>
573 <Reference name="OpenSim.Framework.Servers"/>
555 <Reference name="OpenSim.Framework.Statistics"/> 574 <Reference name="OpenSim.Framework.Statistics"/>
556 <Reference name="OpenSim.Region.Interfaces"/> 575 <Reference name="OpenSim.Region.Physics.Manager"/>
557 <Reference name="OpenMetaverseTypes.dll"/> 576 <Reference name="OpenSim.Grid.AssetServer"/>
558 <Reference name="OpenMetaverse.StructuredData.dll"/> 577
559 <!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code --> 578 <!-- For scripting in funny languages by default -->
560 <Reference name="OpenMetaverse.dll"/> 579 <Reference name="Microsoft.JScript"/>
561 <Reference name="Nini.dll" />
562 <Reference name="XMLRPC.dll"/> 580 <Reference name="XMLRPC.dll"/>
581 <Reference name="OpenSim.Framework.Communications"/>
582 <Reference name="OpenSim.Data.Base"/>
583 <Reference name="Nini.dll" />
563 <Reference name="log4net.dll"/> 584 <Reference name="log4net.dll"/>
564 <Reference name="GlynnTucker.Cache.dll"/> 585 <Reference name="DotNetOpenMail.dll"/>
565 586
566 <Files> 587 <Files>
567 <Match pattern="*.cs" recurse="true"> 588 <Match pattern="*.cs" recurse="true">
568 <Exclude name="Tests" pattern="Tests"/> 589 <Exclude name="Tests" pattern="Tests" />
569 </Match> 590 </Match>
570 </Files> 591 </Files>
571 </Project> 592 </Project>
572 593
594 <!-- OpenSim.Framework.Communications -->
595
573 <Project name="OpenSim.Region.Communications.Local" path="OpenSim/Region/Communications/Local" type="Library"> 596 <Project name="OpenSim.Region.Communications.Local" path="OpenSim/Region/Communications/Local" type="Library">
574 <Configuration name="Debug"> 597 <Configuration name="Debug">
575 <Options> 598 <Options>
@@ -844,8 +867,10 @@
844 <Reference name="OpenMetaverse.StructuredData.dll"/> 867 <Reference name="OpenMetaverse.StructuredData.dll"/>
845 <Reference name="OpenMetaverse.dll"/> 868 <Reference name="OpenMetaverse.dll"/>
846 <Reference name="OpenSim.Framework"/> 869 <Reference name="OpenSim.Framework"/>
870 <Reference name="OpenSim.Framework.Communications"/>
871 <Reference name="OpenSim.Grid"/>
847 <Reference name="OpenSim.Data" /> 872 <Reference name="OpenSim.Data" />
848 <Reference name="OpenSim.Region.Interfaces" /> 873 <Reference name="OpenSim.Region.Framework" />
849 <Reference name="OpenSim.Framework.Console"/> 874 <Reference name="OpenSim.Framework.Console"/>
850 <Reference name="OpenSim.Framework.Servers"/> 875 <Reference name="OpenSim.Framework.Servers"/>
851 <Reference name="OpenSim.Framework.Statistics"/> 876 <Reference name="OpenSim.Framework.Statistics"/>
@@ -868,6 +893,7 @@
868 </Files> 893 </Files>
869 </Project> 894 </Project>
870 895
896
871 <Project name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library"> 897 <Project name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library">
872 <Configuration name="Debug"> 898 <Configuration name="Debug">
873 <Options> 899 <Options>
@@ -891,8 +917,7 @@
891 <Reference name="OpenSim.Framework.Statistics"/> 917 <Reference name="OpenSim.Framework.Statistics"/>
892 <Reference name="OpenSim.Region.Communications.Local"/> 918 <Reference name="OpenSim.Region.Communications.Local"/>
893 <Reference name="OpenSim.Region.Communications.OGS1"/> 919 <Reference name="OpenSim.Region.Communications.OGS1"/>
894 <Reference name="OpenSim.Region.Environment"/> 920 <Reference name="OpenSim.Region.Framework"/>
895 <Reference name="OpenSim.Region.Interfaces"/>
896 <Reference name="OpenMetaverse.dll"/> 921 <Reference name="OpenMetaverse.dll"/>
897 <Reference name="OpenMetaverseTypes.dll"/> 922 <Reference name="OpenMetaverseTypes.dll"/>
898 <Reference name="XMLRPC.dll"/> 923 <Reference name="XMLRPC.dll"/>
@@ -919,7 +944,7 @@
919 <Reference name="System" localCopy="false"/> 944 <Reference name="System" localCopy="false"/>
920 <Reference name="System.Xml"/> 945 <Reference name="System.Xml"/>
921 <Reference name="OpenMetaverseTypes.dll"/> 946 <Reference name="OpenMetaverseTypes.dll"/>
922 <Reference name="OpenSim.Region.Environment"/> 947 <Reference name="OpenSim.Region.Framework"/>
923 <Reference name="OpenSim.Framework"/> 948 <Reference name="OpenSim.Framework"/>
924 <Reference name="OpenSim.Data"/> 949 <Reference name="OpenSim.Data"/>
925 <Reference name="OpenSim.Framework.Servers"/> 950 <Reference name="OpenSim.Framework.Servers"/>
@@ -956,9 +981,8 @@
956 <Reference name="OpenMetaverseTypes.dll"/> 981 <Reference name="OpenMetaverseTypes.dll"/>
957 <Reference name="OpenMetaverse.StructuredData.dll"/> 982 <Reference name="OpenMetaverse.StructuredData.dll"/>
958 <Reference name="OpenMetaverse.dll"/> 983 <Reference name="OpenMetaverse.dll"/>
959 <Reference name="OpenSim.Region.Environment"/> 984 <Reference name="OpenSim.Region.Framework"/>
960 <Reference name="OpenSim.Framework"/> 985 <Reference name="OpenSim.Framework"/>
961 <Reference name="OpenSim.Region.Interfaces"/>
962 <Reference name="OpenSim.Data"/> 986 <Reference name="OpenSim.Data"/>
963 <Reference name="OpenSim.Framework.Servers"/> 987 <Reference name="OpenSim.Framework.Servers"/>
964 <Reference name="OpenSim.Framework.Console"/> 988 <Reference name="OpenSim.Framework.Console"/>
@@ -995,7 +1019,7 @@
995 <Reference name="System.Xml"/> 1019 <Reference name="System.Xml"/>
996 <Reference name="OpenMetaverseTypes.dll"/> 1020 <Reference name="OpenMetaverseTypes.dll"/>
997 <Reference name="OpenSim.Framework"/> 1021 <Reference name="OpenSim.Framework"/>
998 <Reference name="OpenSim.Region.Environment"/> 1022 <Reference name="OpenSim.Region.Framework"/>
999 <Reference name="OpenSim.Framework.Console"/> 1023 <Reference name="OpenSim.Framework.Console"/>
1000 <Reference name="log4net.dll"/> 1024 <Reference name="log4net.dll"/>
1001 1025
@@ -1023,7 +1047,7 @@
1023 <Reference name="IronMath.dll"/> 1047 <Reference name="IronMath.dll"/>
1024 <Reference name="OpenSim.Framework"/> 1048 <Reference name="OpenSim.Framework"/>
1025 <Reference name="OpenSim.Data.Base" /> 1049 <Reference name="OpenSim.Data.Base" />
1026 <Reference name="OpenSim.Region.Environment"/> 1050 <Reference name="OpenSim.Region.Framework"/>
1027 <Reference name="Nini.dll" /> 1051 <Reference name="Nini.dll" />
1028 <Reference name="log4net.dll"/> 1052 <Reference name="log4net.dll"/>
1029 <Files> 1053 <Files>
@@ -1046,6 +1070,7 @@
1046 <ReferencePath>../../../../../../bin/</ReferencePath> 1070 <ReferencePath>../../../../../../bin/</ReferencePath>
1047 <Reference name="System" localCopy="false"/> 1071 <Reference name="System" localCopy="false"/>
1048 <Reference name="OpenSim.Framework"/> 1072 <Reference name="OpenSim.Framework"/>
1073 <Reference name="OpenSim.Region.Framework"/>
1049 <Reference name="OpenSim.Region.Environment"/> 1074 <Reference name="OpenSim.Region.Environment"/>
1050 <Files> 1075 <Files>
1051 <Match pattern="*.cs" recurse="true"/> 1076 <Match pattern="*.cs" recurse="true"/>
@@ -1072,6 +1097,7 @@
1072 <Reference name="OpenSim.Framework"/> 1097 <Reference name="OpenSim.Framework"/>
1073 <Reference name="OpenSim.Framework.Communications"/> 1098 <Reference name="OpenSim.Framework.Communications"/>
1074 <Reference name="OpenSim.Data.Base" /> 1099 <Reference name="OpenSim.Data.Base" />
1100 <Reference name="OpenSim.Region.Framework"/>
1075 <Reference name="OpenSim.Region.Environment"/> 1101 <Reference name="OpenSim.Region.Environment"/>
1076 <Reference name="Nini.dll" /> 1102 <Reference name="Nini.dll" />
1077 <Reference name="PumaCode.SvnDotNet.dll" /> 1103 <Reference name="PumaCode.SvnDotNet.dll" />
@@ -1107,6 +1133,7 @@
1107 <Reference name="OpenSim.Region.Physics.Manager"/> 1133 <Reference name="OpenSim.Region.Physics.Manager"/>
1108 <Reference name="OpenSim.Framework.Servers"/> 1134 <Reference name="OpenSim.Framework.Servers"/>
1109 <Reference name="OpenSim.Framework.Statistics"/> 1135 <Reference name="OpenSim.Framework.Statistics"/>
1136 <Reference name="OpenSim.Region.Framework"/>
1110 <Reference name="OpenSim.Region.Environment"/> 1137 <Reference name="OpenSim.Region.Environment"/>
1111 <Reference name="OpenSim.Region.ClientStack"/> 1138 <Reference name="OpenSim.Region.ClientStack"/>
1112 <Reference name="OpenSim.Framework.Communications"/> 1139 <Reference name="OpenSim.Framework.Communications"/>
@@ -1177,6 +1204,7 @@
1177 <Reference name="XMLRPC.dll" /> 1204 <Reference name="XMLRPC.dll" />
1178 <Reference name="OpenSim"/> 1205 <Reference name="OpenSim"/>
1179 <Reference name="OpenSim.Region.ClientStack"/> 1206 <Reference name="OpenSim.Region.ClientStack"/>
1207 <Reference name="OpenSim.Region.Framework"/>
1180 <Reference name="OpenSim.Region.Environment"/> 1208 <Reference name="OpenSim.Region.Environment"/>
1181 <Reference name="OpenSim.Framework.Communications"/> 1209 <Reference name="OpenSim.Framework.Communications"/>
1182 <Reference name="OpenSim.Framework"/> 1210 <Reference name="OpenSim.Framework"/>
@@ -1213,6 +1241,7 @@
1213 <Reference name="XMLRPC.dll" /> 1241 <Reference name="XMLRPC.dll" />
1214 <Reference name="OpenSim"/> 1242 <Reference name="OpenSim"/>
1215 <Reference name="OpenSim.Region.ClientStack"/> 1243 <Reference name="OpenSim.Region.ClientStack"/>
1244 <Reference name="OpenSim.Region.Framework"/>
1216 <Reference name="OpenSim.Region.Environment"/> 1245 <Reference name="OpenSim.Region.Environment"/>
1217 <Reference name="OpenSim.Framework.Communications"/> 1246 <Reference name="OpenSim.Framework.Communications"/>
1218 <Reference name="OpenSim.Framework"/> 1247 <Reference name="OpenSim.Framework"/>
@@ -1246,6 +1275,7 @@
1246 <Reference name="Nini.dll" /> 1275 <Reference name="Nini.dll" />
1247 <Reference name="XMLRPC.dll" /> 1276 <Reference name="XMLRPC.dll" />
1248 <Reference name="OpenSim"/> 1277 <Reference name="OpenSim"/>
1278 <Reference name="OpenSim.Region.Framework"/>
1249 <Reference name="OpenSim.Region.ClientStack"/> 1279 <Reference name="OpenSim.Region.ClientStack"/>
1250 <Reference name="OpenSim.Region.Environment"/> 1280 <Reference name="OpenSim.Region.Environment"/>
1251 <Reference name="OpenSim.Framework.Communications"/> 1281 <Reference name="OpenSim.Framework.Communications"/>
@@ -1284,6 +1314,7 @@
1284 <Reference name="Nini.dll" /> 1314 <Reference name="Nini.dll" />
1285 <Reference name="XMLRPC.dll" /> 1315 <Reference name="XMLRPC.dll" />
1286 <Reference name="OpenSim"/> 1316 <Reference name="OpenSim"/>
1317 <Reference name="OpenSim.Region.Framework"/>
1287 <Reference name="OpenSim.Region.ClientStack"/> 1318 <Reference name="OpenSim.Region.ClientStack"/>
1288 <Reference name="OpenSim.Region.Environment"/> 1319 <Reference name="OpenSim.Region.Environment"/>
1289 <Reference name="OpenSim.Framework.Communications"/> 1320 <Reference name="OpenSim.Framework.Communications"/>
@@ -1323,6 +1354,7 @@
1323 <Reference name="OpenSim.Framework.Communications"/> 1354 <Reference name="OpenSim.Framework.Communications"/>
1324 <Reference name="OpenSim.Framework.Console"/> 1355 <Reference name="OpenSim.Framework.Console"/>
1325 <Reference name="OpenSim.Framework.Servers"/> 1356 <Reference name="OpenSim.Framework.Servers"/>
1357 <Reference name="OpenSim.Region.Framework"/>
1326 <Reference name="OpenSim.Region.Environment"/> 1358 <Reference name="OpenSim.Region.Environment"/>
1327 <Reference name="OpenMetaverseTypes.dll"/> 1359 <Reference name="OpenMetaverseTypes.dll"/>
1328 <Reference name="OpenMetaverse.dll"/> 1360 <Reference name="OpenMetaverse.dll"/>
@@ -1351,7 +1383,7 @@
1351 <Reference name="OpenMetaverse.dll"/> 1383 <Reference name="OpenMetaverse.dll"/>
1352 <Reference name="System" localCopy="false"/> 1384 <Reference name="System" localCopy="false"/>
1353 <Reference name="OpenSim.Framework"/> 1385 <Reference name="OpenSim.Framework"/>
1354 <Reference name="OpenSim.Region.Environment"/> 1386 <Reference name="OpenSim.Region.Framework"/>
1355 <Reference name="Nini.dll" /> 1387 <Reference name="Nini.dll" />
1356 <Reference name="log4net.dll"/> 1388 <Reference name="log4net.dll"/>
1357 <Files> 1389 <Files>
@@ -1386,7 +1418,7 @@
1386 <Reference name="OpenMetaverse.dll"/> 1418 <Reference name="OpenMetaverse.dll"/>
1387 <Reference name="MySql.Data.dll"/> 1419 <Reference name="MySql.Data.dll"/>
1388 <Reference name="OpenSim.Framework.Console"/> 1420 <Reference name="OpenSim.Framework.Console"/>
1389 <Reference name="OpenSim.Region.Environment"/> 1421 <Reference name="OpenSim.Region.Framework"/>
1390 <Reference name="log4net.dll"/> 1422 <Reference name="log4net.dll"/>
1391 <Reference name="Mono.Addins.dll" /> 1423 <Reference name="Mono.Addins.dll" />
1392 1424
@@ -1418,7 +1450,7 @@
1418 <Reference name="System.Drawing"/> 1450 <Reference name="System.Drawing"/>
1419 <Reference name="OpenSim.Framework"/> 1451 <Reference name="OpenSim.Framework"/>
1420 <Reference name="OpenSim.Data"/> 1452 <Reference name="OpenSim.Data"/>
1421 <Reference name="OpenSim.Region.Environment"/> 1453 <Reference name="OpenSim.Region.Framework"/>
1422 <Reference name="OpenSim.Framework.Console"/> 1454 <Reference name="OpenSim.Framework.Console"/>
1423 <Reference name="OpenMetaverseTypes.dll"/> 1455 <Reference name="OpenMetaverseTypes.dll"/>
1424 <Reference name="OpenMetaverse.dll"/> 1456 <Reference name="OpenMetaverse.dll"/>
@@ -1453,7 +1485,7 @@
1453 <Reference name="System.Drawing"/> 1485 <Reference name="System.Drawing"/>
1454 <Reference name="OpenSim.Framework"/> 1486 <Reference name="OpenSim.Framework"/>
1455 <Reference name="OpenSim.Framework.Console"/> 1487 <Reference name="OpenSim.Framework.Console"/>
1456 <Reference name="OpenSim.Region.Environment"/> 1488 <Reference name="OpenSim.Region.Framework"/>
1457 <Reference name="OpenMetaverseTypes.dll"/> 1489 <Reference name="OpenMetaverseTypes.dll"/>
1458 <Reference name="OpenMetaverse.dll"/> 1490 <Reference name="OpenMetaverse.dll"/>
1459 <Reference name="Mono.Data.SqliteClient"/> 1491 <Reference name="Mono.Data.SqliteClient"/>
@@ -1489,7 +1521,7 @@
1489 <Reference name="OpenSim.Data"/> 1521 <Reference name="OpenSim.Data"/>
1490 <Reference name="OpenSim.Framework"/> 1522 <Reference name="OpenSim.Framework"/>
1491 <Reference name="OpenSim.Framework.Console"/> 1523 <Reference name="OpenSim.Framework.Console"/>
1492 <Reference name="OpenSim.Region.Environment"/> 1524 <Reference name="OpenSim.Region.Framework"/>
1493 <Reference name="OpenMetaverseTypes.dll"/> 1525 <Reference name="OpenMetaverseTypes.dll"/>
1494 <Reference name="OpenMetaverse.dll"/> 1526 <Reference name="OpenMetaverse.dll"/>
1495 <Reference name="NHibernate.dll"/> 1527 <Reference name="NHibernate.dll"/>
@@ -1552,6 +1584,7 @@
1552 <Reference name="OpenSim" /> 1584 <Reference name="OpenSim" />
1553 <Reference name="OpenSim.Framework"/> 1585 <Reference name="OpenSim.Framework"/>
1554 <Reference name="OpenSim.Framework.Communications"/> 1586 <Reference name="OpenSim.Framework.Communications"/>
1587 <Reference name="OpenSim.Region.Framework" />
1555 <Reference name="OpenSim.Region.Environment" /> 1588 <Reference name="OpenSim.Region.Environment" />
1556 <Reference name="OpenSim.Framework.Console"/> 1589 <Reference name="OpenSim.Framework.Console"/>
1557 <Reference name="Nini.dll" /> 1590 <Reference name="Nini.dll" />
@@ -1588,6 +1621,7 @@
1588 <Reference name="OpenSim" /> 1621 <Reference name="OpenSim" />
1589 <Reference name="OpenSim.Framework"/> 1622 <Reference name="OpenSim.Framework"/>
1590 <Reference name="OpenSim.Framework.Communications"/> 1623 <Reference name="OpenSim.Framework.Communications"/>
1624 <Reference name="OpenSim.Region.Framework" />
1591 <Reference name="OpenSim.Region.Environment" /> 1625 <Reference name="OpenSim.Region.Environment" />
1592 <Reference name="OpenSim.Framework.Console"/> 1626 <Reference name="OpenSim.Framework.Console"/>
1593 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 1627 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
@@ -1657,7 +1691,7 @@
1657 <Reference name="OpenSim" /> 1691 <Reference name="OpenSim" />
1658 <Reference name="OpenSim.Framework"/> 1692 <Reference name="OpenSim.Framework"/>
1659 <Reference name="OpenSim.Framework.Communications"/> 1693 <Reference name="OpenSim.Framework.Communications"/>
1660 <Reference name="OpenSim.Region.Interfaces" /> 1694 <Reference name="OpenSim.Region.Framework" />
1661 <Reference name="OpenSim.Region.Environment" /> 1695 <Reference name="OpenSim.Region.Environment" />
1662 <Reference name="OpenSim.Region.Physics.Manager" /> 1696 <Reference name="OpenSim.Region.Physics.Manager" />
1663 <Reference name="OpenSim.Framework.Console"/> 1697 <Reference name="OpenSim.Framework.Console"/>
@@ -1689,7 +1723,7 @@
1689 <Reference name="System" localCopy="false"/> 1723 <Reference name="System" localCopy="false"/>
1690 <Reference name="Microsoft.JScript"/> 1724 <Reference name="Microsoft.JScript"/>
1691 <Reference name="OpenSim.Framework" /> 1725 <Reference name="OpenSim.Framework" />
1692 <Reference name="OpenSim.Region.Environment" /> 1726 <Reference name="OpenSim.Region.Framework" />
1693 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 1727 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
1694 <Reference name="OpenSim.Region.ScriptEngine.Shared.YieldProlog"/> 1728 <Reference name="OpenSim.Region.ScriptEngine.Shared.YieldProlog"/>
1695 <Reference name="OpenSim.Region.Environment" /> 1729 <Reference name="OpenSim.Region.Environment" />
@@ -1727,7 +1761,7 @@
1727 <Reference name="OpenSim" /> 1761 <Reference name="OpenSim" />
1728 <Reference name="OpenSim.Framework"/> 1762 <Reference name="OpenSim.Framework"/>
1729 <Reference name="OpenSim.Framework.Communications"/> 1763 <Reference name="OpenSim.Framework.Communications"/>
1730 <Reference name="OpenSim.Region.Interfaces" /> 1764 <Reference name="OpenSim.Region.Framework" />
1731 <Reference name="OpenSim.Region.Environment" /> 1765 <Reference name="OpenSim.Region.Environment" />
1732 <Reference name="OpenSim.Framework.Console"/> 1766 <Reference name="OpenSim.Framework.Console"/>
1733 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 1767 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
@@ -1767,7 +1801,7 @@
1767 <Reference name="OpenSim" /> 1801 <Reference name="OpenSim" />
1768 <Reference name="OpenSim.Framework"/> 1802 <Reference name="OpenSim.Framework"/>
1769 <Reference name="OpenSim.Framework.Communications"/> 1803 <Reference name="OpenSim.Framework.Communications"/>
1770 <Reference name="OpenSim.Region.Interfaces" /> 1804 <Reference name="OpenSim.Region.Framework" />
1771 <Reference name="OpenSim.Region.Environment" /> 1805 <Reference name="OpenSim.Region.Environment" />
1772 <Reference name="OpenSim.Framework.Console"/> 1806 <Reference name="OpenSim.Framework.Console"/>
1773 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 1807 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
@@ -1809,7 +1843,7 @@
1809 <Reference name="OpenSim.Framework"/> 1843 <Reference name="OpenSim.Framework"/>
1810 <Reference name="OpenSim.Framework.Console"/> 1844 <Reference name="OpenSim.Framework.Console"/>
1811 <Reference name="OpenSim.Region.Environment" /> 1845 <Reference name="OpenSim.Region.Environment" />
1812 <Reference name="OpenSim.Region.Interfaces" /> 1846 <Reference name="OpenSim.Region.Framework" />
1813 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 1847 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
1814 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> 1848 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/>
1815 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/> 1849 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/>
@@ -1869,7 +1903,7 @@
1869 <Reference name="OpenSim.Framework"/> 1903 <Reference name="OpenSim.Framework"/>
1870 <Reference name="OpenSim.Framework.Communications"/> 1904 <Reference name="OpenSim.Framework.Communications"/>
1871 <Reference name="OpenSim.Region.Environment" /> 1905 <Reference name="OpenSim.Region.Environment" />
1872 <Reference name="OpenSim.Region.Interfaces" /> 1906 <Reference name="OpenSim.Region.Framework" />
1873 <Reference name="OpenSim.Region.Physics.Manager" /> 1907 <Reference name="OpenSim.Region.Physics.Manager" />
1874 <Reference name="OpenSim.Framework.Console"/> 1908 <Reference name="OpenSim.Framework.Console"/>
1875 <Reference name="Nini.dll" /> 1909 <Reference name="Nini.dll" />
@@ -1907,7 +1941,7 @@
1907 <Reference name="OpenSim.Framework"/> 1941 <Reference name="OpenSim.Framework"/>
1908 <Reference name="OpenSim.Framework.Communications"/> 1942 <Reference name="OpenSim.Framework.Communications"/>
1909 <Reference name="OpenSim.Region.Environment" /> 1943 <Reference name="OpenSim.Region.Environment" />
1910 <Reference name="OpenSim.Region.Interfaces" /> 1944 <Reference name="OpenSim.Region.Framework" />
1911 <Reference name="OpenSim.Region.Physics.Manager" /> 1945 <Reference name="OpenSim.Region.Physics.Manager" />
1912 <Reference name="OpenSim.Framework.Console"/> 1946 <Reference name="OpenSim.Framework.Console"/>
1913 <Reference name="Nini.dll" /> 1947 <Reference name="Nini.dll" />
@@ -1948,7 +1982,7 @@
1948 <Reference name="OpenSim.Framework"/> 1982 <Reference name="OpenSim.Framework"/>
1949 <Reference name="OpenSim.Framework.Communications"/> 1983 <Reference name="OpenSim.Framework.Communications"/>
1950 <Reference name="OpenSim.Region.Environment" /> 1984 <Reference name="OpenSim.Region.Environment" />
1951 <Reference name="OpenSim.Region.Interfaces" /> 1985 <Reference name="OpenSim.Region.Framework" />
1952 <Reference name="OpenSim.Region.Physics.Manager" /> 1986 <Reference name="OpenSim.Region.Physics.Manager" />
1953 <Reference name="OpenSim.Framework.Console"/> 1987 <Reference name="OpenSim.Framework.Console"/>
1954 <Reference name="Nini.dll" /> 1988 <Reference name="Nini.dll" />
@@ -1987,7 +2021,7 @@
1987 <Reference name="OpenSim.Framework"/> 2021 <Reference name="OpenSim.Framework"/>
1988 <Reference name="OpenSim.Framework.Communications"/> 2022 <Reference name="OpenSim.Framework.Communications"/>
1989 <Reference name="OpenSim.Region.Environment" /> 2023 <Reference name="OpenSim.Region.Environment" />
1990 <Reference name="OpenSim.Region.Interfaces" /> 2024 <Reference name="OpenSim.Region.Framework" />
1991 <Reference name="OpenSim.Region.Physics.Manager" /> 2025 <Reference name="OpenSim.Region.Physics.Manager" />
1992 <Reference name="OpenSim.Framework.Console"/> 2026 <Reference name="OpenSim.Framework.Console"/>
1993 <Reference name="Nini.dll" /> 2027 <Reference name="Nini.dll" />
@@ -2027,7 +2061,7 @@
2027 <Reference name="OpenSim.Framework"/> 2061 <Reference name="OpenSim.Framework"/>
2028 <Reference name="OpenSim.Framework.Communications"/> 2062 <Reference name="OpenSim.Framework.Communications"/>
2029 <Reference name="OpenSim.Region.Environment" /> 2063 <Reference name="OpenSim.Region.Environment" />
2030 <Reference name="OpenSim.Region.Interfaces" /> 2064 <Reference name="OpenSim.Region.Framework" />
2031 <Reference name="OpenSim.Region.Physics.Manager" /> 2065 <Reference name="OpenSim.Region.Physics.Manager" />
2032 <Reference name="OpenSim.Framework.Console"/> 2066 <Reference name="OpenSim.Framework.Console"/>
2033 <Reference name="Nini.dll" /> 2067 <Reference name="Nini.dll" />
@@ -2068,7 +2102,7 @@
2068 <Reference name="OpenSim.Framework"/> 2102 <Reference name="OpenSim.Framework"/>
2069 <Reference name="OpenSim.Framework.Communications"/> 2103 <Reference name="OpenSim.Framework.Communications"/>
2070 <Reference name="OpenSim.Region.Environment" /> 2104 <Reference name="OpenSim.Region.Environment" />
2071 <Reference name="OpenSim.Region.Interfaces" /> 2105 <Reference name="OpenSim.Region.Framework" />
2072 <Reference name="OpenSim.Region.Physics.Manager" /> 2106 <Reference name="OpenSim.Region.Physics.Manager" />
2073 <Reference name="OpenSim.Framework.Console"/> 2107 <Reference name="OpenSim.Framework.Console"/>
2074 <Reference name="Nini.dll" /> 2108 <Reference name="Nini.dll" />
@@ -2109,7 +2143,7 @@
2109 <Reference name="OpenSim.Framework"/> 2143 <Reference name="OpenSim.Framework"/>
2110 <Reference name="OpenSim.Framework.Communications"/> 2144 <Reference name="OpenSim.Framework.Communications"/>
2111 <Reference name="OpenSim.Region.Environment" /> 2145 <Reference name="OpenSim.Region.Environment" />
2112 <Reference name="OpenSim.Region.Interfaces" /> 2146 <Reference name="OpenSim.Region.Framework" />
2113 <Reference name="OpenSim.Region.Physics.Manager" /> 2147 <Reference name="OpenSim.Region.Physics.Manager" />
2114 <Reference name="OpenSim.Framework.Console"/> 2148 <Reference name="OpenSim.Framework.Console"/>
2115 <Reference name="Nini.dll" /> 2149 <Reference name="Nini.dll" />
@@ -2149,7 +2183,7 @@
2149 <Reference name="OpenSim.Framework"/> 2183 <Reference name="OpenSim.Framework"/>
2150 <Reference name="OpenSim.Framework.Communications"/> 2184 <Reference name="OpenSim.Framework.Communications"/>
2151 <Reference name="OpenSim.Region.Environment" /> 2185 <Reference name="OpenSim.Region.Environment" />
2152 <Reference name="OpenSim.Region.Interfaces" /> 2186 <Reference name="OpenSim.Region.Framework" />
2153 <Reference name="OpenSim.Region.Physics.Manager" /> 2187 <Reference name="OpenSim.Region.Physics.Manager" />
2154 <Reference name="OpenSim.Framework.Console"/> 2188 <Reference name="OpenSim.Framework.Console"/>
2155 <Reference name="Nini.dll" /> 2189 <Reference name="Nini.dll" />
@@ -2193,7 +2227,7 @@
2193 <Reference name="OpenMetaverse.dll"/> 2227 <Reference name="OpenMetaverse.dll"/>
2194 <Reference name="OpenSim.Framework"/> 2228 <Reference name="OpenSim.Framework"/>
2195 <Reference name="OpenSim.Data" /> 2229 <Reference name="OpenSim.Data" />
2196 <Reference name="OpenSim.Region.Interfaces" /> 2230 <Reference name="OpenSim.Region.Framework" />
2197 <Reference name="OpenSim.Region.Environment" /> 2231 <Reference name="OpenSim.Region.Environment" />
2198 <Reference name="OpenSim.Framework.Console"/> 2232 <Reference name="OpenSim.Framework.Console"/>
2199 <Reference name="OpenSim.Framework.Servers"/> 2233 <Reference name="OpenSim.Framework.Servers"/>
@@ -2301,6 +2335,7 @@
2301 <Reference name="OpenSim.Framework.Servers"/> 2335 <Reference name="OpenSim.Framework.Servers"/>
2302 <Reference name="OpenSim.Data"/> 2336 <Reference name="OpenSim.Data"/>
2303 <Reference name="OpenSim.Region.Communications.Local"/> 2337 <Reference name="OpenSim.Region.Communications.Local"/>
2338 <Reference name="OpenSim.Region.Framework"/>
2304 <Reference name="OpenSim.Region.Environment"/> 2339 <Reference name="OpenSim.Region.Environment"/>
2305 <Reference name="OpenSim.Region.Physics.Manager"/> 2340 <Reference name="OpenSim.Region.Physics.Manager"/>
2306 2341
@@ -2330,6 +2365,7 @@
2330 <Reference name="OpenMetaverseTypes.dll"/> 2365 <Reference name="OpenMetaverseTypes.dll"/>
2331 <Reference name="OpenSim.Framework"/> 2366 <Reference name="OpenSim.Framework"/>
2332 <Reference name="OpenSim.Data"/> 2367 <Reference name="OpenSim.Data"/>
2368 <Reference name="OpenSim.Region.Framework"/>
2333 <Reference name="OpenSim.Region.Environment"/> 2369 <Reference name="OpenSim.Region.Environment"/>
2334 <Reference name="log4net.dll"/> 2370 <Reference name="log4net.dll"/>
2335 <Reference name="Mono.Addins.dll" /> 2371 <Reference name="Mono.Addins.dll" />
@@ -2367,7 +2403,7 @@
2367 <Reference name="OpenSim.Data.Tests"/> 2403 <Reference name="OpenSim.Data.Tests"/>
2368 <Reference name="OpenSim.Data.MySQL"/> 2404 <Reference name="OpenSim.Data.MySQL"/>
2369 <Reference name="OpenSim.Framework.Console"/> 2405 <Reference name="OpenSim.Framework.Console"/>
2370 <Reference name="OpenSim.Region.Environment"/> 2406 <Reference name="OpenSim.Region.Framework"/>
2371 <Reference name="log4net.dll"/> 2407 <Reference name="log4net.dll"/>
2372 <Reference name="nunit.framework.dll" /> 2408 <Reference name="nunit.framework.dll" />
2373 <Reference name="Mono.Addins.dll" /> 2409 <Reference name="Mono.Addins.dll" />
@@ -2401,7 +2437,7 @@
2401 <Reference name="OpenSim.Data.NHibernate"/> 2437 <Reference name="OpenSim.Data.NHibernate"/>
2402 <Reference name="OpenSim.Data.Tests"/> 2438 <Reference name="OpenSim.Data.Tests"/>
2403 <Reference name="OpenSim.Framework.Console"/> 2439 <Reference name="OpenSim.Framework.Console"/>
2404 <Reference name="OpenSim.Region.Environment"/> 2440 <Reference name="OpenSim.Region.Framework"/>
2405 <Reference name="OpenMetaverseTypes.dll"/> 2441 <Reference name="OpenMetaverseTypes.dll"/>
2406 <Reference name="OpenMetaverse.dll"/> 2442 <Reference name="OpenMetaverse.dll"/>
2407 <Reference name="MySql.Data.dll"/> 2443 <Reference name="MySql.Data.dll"/>
@@ -2440,7 +2476,7 @@
2440 <Reference name="System.Drawing"/> 2476 <Reference name="System.Drawing"/>
2441 <Reference name="OpenSim.Framework"/> 2477 <Reference name="OpenSim.Framework"/>
2442 <Reference name="OpenSim.Framework.Console"/> 2478 <Reference name="OpenSim.Framework.Console"/>
2443 <Reference name="OpenSim.Region.Environment"/> 2479 <Reference name="OpenSim.Region.Framework"/>
2444 <Reference name="OpenMetaverseTypes.dll"/> 2480 <Reference name="OpenMetaverseTypes.dll"/>
2445 <Reference name="OpenMetaverse.dll"/> 2481 <Reference name="OpenMetaverse.dll"/>
2446 <Reference name="Mono.Data.SqliteClient"/> 2482 <Reference name="Mono.Data.SqliteClient"/>
@@ -2565,7 +2601,7 @@
2565 <Reference name="OpenSim.Framework.Servers"/> 2601 <Reference name="OpenSim.Framework.Servers"/>
2566 <Reference name="OpenSim.Framework.Statistics"/> 2602 <Reference name="OpenSim.Framework.Statistics"/>
2567 <Reference name="OpenSim.Region.Communications.Local"/> 2603 <Reference name="OpenSim.Region.Communications.Local"/>
2568 <Reference name="OpenSim.Region.Interfaces"/> 2604 <Reference name="OpenSim.Region.Framework"/>
2569 <Reference name="OpenSim.Region.Environment"/> 2605 <Reference name="OpenSim.Region.Environment"/>
2570 <Reference name="OpenSim.Region.Physics.Manager"/> 2606 <Reference name="OpenSim.Region.Physics.Manager"/>
2571 2607
@@ -2624,7 +2660,7 @@
2624 <Reference name="OpenSim.Framework.Statistics"/> 2660 <Reference name="OpenSim.Framework.Statistics"/>
2625 <Reference name="OpenSim.Region.ClientStack"/> 2661 <Reference name="OpenSim.Region.ClientStack"/>
2626 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> 2662 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
2627 <Reference name="OpenSim.Region.Environment"/> 2663 <Reference name="OpenSim.Region.Framework"/>
2628 <Reference name="OpenSim.Tests.Common"/> 2664 <Reference name="OpenSim.Tests.Common"/>
2629 2665
2630 <Files> 2666 <Files>