aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs9
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs6
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs9
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs23
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs10
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs8
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs26
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs7
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs11
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs15
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs16
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs5
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs18
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs17
-rw-r--r--OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs5
-rw-r--r--OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs4
-rw-r--r--OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs4
-rw-r--r--OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs6
-rw-r--r--OpenSim/Data/MSSQL/MSSQLEstateData.cs4
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLInventoryData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs4
-rw-r--r--OpenSim/Data/MSSQL/MSSQLMigration.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs2
-rw-r--r--OpenSim/Data/Migration.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs12
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs11
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs5
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLLogData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs5
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs9
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs9
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLGridTest.cs9
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs10
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs9
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLUserTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/ColorUserType.cs4
-rw-r--r--OpenSim/Data/NHibernate/LLQuaternionUserType.cs2
-rw-r--r--OpenSim/Data/NHibernate/LLUUIDUserType.cs2
-rw-r--r--OpenSim/Data/NHibernate/LLVector3UserType.cs2
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs8
-rw-r--r--OpenSim/Data/NHibernate/NHibernateGridData.cs13
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs5
-rw-r--r--OpenSim/Data/NHibernate/NHibernateManager.cs6
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs6
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs6
-rw-r--r--OpenSim/Data/NHibernate/SByteType.cs2
-rw-r--r--OpenSim/Data/NHibernate/Terrain.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs10
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs10
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/TextureUserType.cs4
-rw-r--r--OpenSim/Data/NHibernate/UInt16Type.cs2
-rw-r--r--OpenSim/Data/NHibernate/UInt32Type.cs2
-rw-r--r--OpenSim/Data/NHibernate/UInt64Type.cs2
-rw-r--r--OpenSim/Data/NHibernate/UserFriend.cs3
-rw-r--r--OpenSim/Data/RegionProfileData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs9
-rw-r--r--OpenSim/Data/SQLite/SQLiteGridData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteManager.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs5
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs4
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs9
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs7
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs10
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs9
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs9
-rw-r--r--OpenSim/Data/Tests/BasicAssetTest.cs8
-rw-r--r--OpenSim/Data/Tests/BasicEstateTest.cs9
-rw-r--r--OpenSim/Data/Tests/BasicGridTest.cs6
-rw-r--r--OpenSim/Data/Tests/BasicInventoryTest.cs8
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs13
-rw-r--r--OpenSim/Data/Tests/BasicUserTest.cs7
-rw-r--r--OpenSim/Data/UserDataBase.cs2
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs9
-rw-r--r--OpenSim/Framework/AssetBase.cs2
-rw-r--r--OpenSim/Framework/AssetConfig.cs3
-rw-r--r--OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs2
-rw-r--r--OpenSim/Framework/Cache.cs4
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs18
-rw-r--r--OpenSim/Framework/Client/IClientChat.cs3
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs1
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs1
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs5
-rw-r--r--OpenSim/Framework/Communications/Capabilities/CapsUtil.cs1
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs3
-rw-r--r--OpenSim/Framework/Communications/GridInfoService.cs1
-rw-r--r--OpenSim/Framework/Communications/IAvatarService.cs3
-rw-r--r--OpenSim/Framework/Communications/IHyperlink.cs5
-rw-r--r--OpenSim/Framework/Communications/ISecureInventoryService.cs4
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs6
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs4
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs4
-rw-r--r--OpenSim/Framework/Communications/RestClient.cs2
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs7
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs2
-rw-r--r--OpenSim/Framework/Communications/Tests/LoginServiceTests.cs10
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs7
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppError.cs2
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs2
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs2
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs2
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppSerializer.cs4
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppStanza.cs1
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppWriter.cs1
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs2
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs17
-rw-r--r--OpenSim/Framework/ForeignUserProfileData.cs2
-rw-r--r--OpenSim/Framework/HGNetworkServersInfo.cs4
-rw-r--r--OpenSim/Framework/IClientFileTransfer.cs5
-rw-r--r--OpenSim/Framework/IMoneyModule.cs2
-rw-r--r--OpenSim/Framework/IPlugin.cs2
-rw-r--r--OpenSim/Framework/IScene.cs1
-rw-r--r--OpenSim/Framework/InventoryNodeBase.cs4
-rw-r--r--OpenSim/Framework/LandData.cs6
-rw-r--r--OpenSim/Framework/Servers/BaseHTTPHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs16
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs5
-rw-r--r--OpenSim/Framework/Servers/BaseStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/BinaryStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/IHttpAgentHandler.cs4
-rw-r--r--OpenSim/Framework/Servers/IStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/OSHttpRequest.cs2
-rw-r--r--OpenSim/Framework/Servers/OSHttpResponse.cs2
-rw-r--r--OpenSim/Framework/Servers/RestDeserialiseHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/RestHTTPHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/RestSessionService.cs2
-rw-r--r--OpenSim/Framework/Servers/RestStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/Tests/OSHttpTests.cs9
-rw-r--r--OpenSim/Framework/SimStats.cs7
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsCollector.cs1
-rw-r--r--OpenSim/Framework/Tests/LocationTest.cs2
-rw-r--r--OpenSim/Framework/Tests/UtilTest.cs2
-rw-r--r--OpenSim/Framework/UserConfig.cs3
-rw-r--r--OpenSim/Framework/Util.cs10
-rw-r--r--OpenSim/Framework/WearableItem.cs2
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs4
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs5
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs3
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs1
-rw-r--r--OpenSim/Grid/GridServer/Program.cs1
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs7
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs3
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs10
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceInformer.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceService.cs4
-rw-r--r--OpenSim/Grid/MessagingServer/UserManager.cs8
-rw-r--r--OpenSim/Grid/MessagingServer/XMPPHTTPService.cs3
-rw-r--r--OpenSim/Grid/UserServer/Main.cs3
-rw-r--r--OpenSim/Grid/UserServer/MessageServersConnector.cs4
-rw-r--r--OpenSim/Grid/UserServer/OpenIdService.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs2
-rw-r--r--OpenSim/Region/Application/Application.cs2
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs13
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs16
-rw-r--r--OpenSim/Region/Application/OpenSim.cs8
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs6
-rw-r--r--OpenSim/Region/ClientStack/ClientStackManager.cs3
-rw-r--r--OpenSim/Region/ClientStack/IClientNetworkServer.cs1
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs30
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs10
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs8
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs29
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs9
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs5
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs1
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs12
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs2
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs5
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs4
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs2
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs14
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs8
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs11
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGUserServices.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs5
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs5
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs7
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs14
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs3
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs9
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs1
-rw-r--r--OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs23
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs24
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs24
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs34
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs16
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs27
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs19
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs19
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs25
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs28
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs35
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs54
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs27
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs22
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs23
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs25
-rw-r--r--OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs28
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs20
-rw-r--r--OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs10
-rw-r--r--OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs46
-rw-r--r--OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs45
-rw-r--r--OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs12
-rw-r--r--OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs8
-rw-r--r--OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs16
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs32
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs26
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs40
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs57
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs22
-rw-r--r--OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs25
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs27
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs20
-rw-r--r--OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs24
-rw-r--r--OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs18
-rw-r--r--OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs31
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs34
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs25
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs31
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs19
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs16
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs22
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs21
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs13
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs29
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs48
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs14
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandChannel.cs15
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs32
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs20
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs25
-rw-r--r--OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs14
-rw-r--r--OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs8
-rw-r--r--OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs18
-rw-r--r--OpenSim/Region/CoreModules/World/Sound/SoundModule.cs16
-rw-r--r--OpenSim/Region/CoreModules/World/Sun/SunModule.cs24
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs10
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs10
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs16
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs10
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs8
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs8
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs7
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs8
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs8
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs9
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs8
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs7
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs7
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs30
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs10
-rw-r--r--OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs20
-rw-r--r--OpenSim/Region/CoreModules/World/Wind/WindModule.cs18
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs8
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs29
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs22
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs31
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs31
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs60
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs7
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs20
-rw-r--r--OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs3
-rw-r--r--OpenSim/Region/DataSnapshot/LLSDDiscovery.cs1
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs7
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs5
-rw-r--r--OpenSim/Region/DataSnapshot/SnapshotStore.cs9
-rw-r--r--OpenSim/Region/Examples/SimpleModule/RegionModule.cs3
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs3
-rw-r--r--OpenSim/Region/Framework/Interfaces/IDialogModule.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEmailModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityInventory.cs6
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs3
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEstateModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEventQueue.cs4
-rw-r--r--OpenSim/Region/Framework/Interfaces/IGroupsModule.cs3
-rw-r--r--OpenSim/Region/Framework/Interfaces/IHttpRequests.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IInterregionComms.cs3
-rw-r--r--OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs4
-rw-r--r--OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/ILandChannel.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IPresenceModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISceneObject.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/IScriptModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISoundModule.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/IWindModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IXMLRPC.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/AnimationSet.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityManager.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs56
383 files changed, 1314 insertions, 2150 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index bd98045..c988ad8 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -25,20 +25,19 @@
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;
29using System.Reflection; 30using System.Reflection;
30using System.Threading; 31using System.Threading;
31using log4net; 32using log4net;
32using Nini.Config;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.RegionLoader.Filesystem; 34using OpenSim.Framework.RegionLoader.Filesystem;
35using OpenSim.Framework.RegionLoader.Web; 35using OpenSim.Framework.RegionLoader.Web;
36 36using OpenSim.Region.CoreModules.Agent.AssetTransaction;
37using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
38using OpenSim.Region.CoreModules.Avatar.InstantMessage; 37using OpenSim.Region.CoreModules.Avatar.InstantMessage;
38using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
39using OpenSim.Region.CoreModules.Scripting.LoadImageURL; 39using OpenSim.Region.CoreModules.Scripting.LoadImageURL;
40using OpenSim.Region.CoreModules.Scripting.XMLRPC; 40using OpenSim.Region.CoreModules.Scripting.XMLRPC;
41using OpenSim.Region.CoreModules.Agent.AssetTransaction;
42 41
43namespace OpenSim.ApplicationPlugins.LoadRegions 42namespace OpenSim.ApplicationPlugins.LoadRegions
44{ 43{
@@ -88,7 +87,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
88 if (!CheckRegionsForSanity(regionsToLoad)) 87 if (!CheckRegionsForSanity(regionsToLoad))
89 { 88 {
90 m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations"); 89 m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations");
91 System.Environment.Exit(1); 90 Environment.Exit(1);
92 } 91 }
93 92
94 for (int i = 0; i < regionsToLoad.Length; i++) 93 for (int i = 0; i < regionsToLoad.Length; i++)
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 43ae818..d457d2b 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -27,20 +27,20 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
30using System.IO; 31using System.IO;
31using System.Net; 32using System.Net;
32using System.Reflection; 33using System.Reflection;
33using System.Timers; 34using System.Timers;
34using OpenMetaverse;
35using log4net; 35using log4net;
36using Nini.Config; 36using Nini.Config;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenMetaverse;
38using OpenSim.Framework; 39using OpenSim.Framework;
39using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
41using OpenSim.Region.CoreModules.World.Terrain;
40using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes; 43using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.CoreModules.World.Terrain;
43using System.Collections.Generic;
44 44
45namespace OpenSim.ApplicationPlugins.RemoteController 45namespace OpenSim.ApplicationPlugins.RemoteController
46{ 46{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs
index f593349..7a7af31 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs
@@ -25,8 +25,6 @@
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;
29
30namespace OpenSim.ApplicationPlugins.Rest.Inventory 28namespace OpenSim.ApplicationPlugins.Rest.Inventory
31{ 29{
32 /// <summary> 30 /// <summary>
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
index 997c2d3..b27f9c5 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
@@ -25,7 +25,6 @@
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;
29using OpenSim.Framework.Servers; 28using OpenSim.Framework.Servers;
30 29
31namespace OpenSim.ApplicationPlugins.Rest.Inventory 30namespace OpenSim.ApplicationPlugins.Rest.Inventory
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
index 20e619a..2ce5166 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
@@ -26,17 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
29using System.IO; 30using System.IO;
30using System.Reflection;
31using System.Text;
32using System.Security.Cryptography; 31using System.Security.Cryptography;
32using System.Text;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using System.Collections.Generic; 34using System.Xml;
35using System.Collections.Specialized;
36using OpenSim.Framework; 35using OpenSim.Framework;
37using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
38using OpenMetaverse;
39using System.Xml;
40 37
41namespace OpenSim.ApplicationPlugins.Rest.Inventory 38namespace OpenSim.ApplicationPlugins.Rest.Inventory
42{ 39{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
index bfa27c3..2ac1001 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
@@ -30,18 +30,17 @@ using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Text; 32using System.Text;
33using log4net;
34using Nini.Config;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Servers;
35using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache;
37using Nini.Config;
38 37
39namespace OpenSim.ApplicationPlugins.Rest.Inventory 38namespace OpenSim.ApplicationPlugins.Rest.Inventory
40{ 39{
41 public class Rest 40 public class Rest
42 { 41 {
43 internal static readonly log4net.ILog Log = 42 internal static readonly ILog Log =
44 log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 44
46 internal static bool DEBUG = Log.IsDebugEnabled; 45 internal static bool DEBUG = Log.IsDebugEnabled;
47 46
@@ -468,25 +467,25 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
468 467
469 public static void Dump(byte[] data) 468 public static void Dump(byte[] data)
470 { 469 {
471 char[] buffer = new char[Rest.DumpLineSize]; 470 char[] buffer = new char[DumpLineSize];
472 int cc = 0; 471 int cc = 0;
473 472
474 for (int i = 0; i < data.Length; i++) 473 for (int i = 0; i < data.Length; i++)
475 { 474 {
476 if (i % Rest.DumpLineSize == 0) Console.Write("\n{0}: ",i.ToString("d8")); 475 if (i % DumpLineSize == 0) Console.Write("\n{0}: ",i.ToString("d8"));
477 476
478 if (i % 4 == 0) Console.Write(" "); 477 if (i % 4 == 0) Console.Write(" ");
479 478
480 Console.Write("{0}",data[i].ToString("x2")); 479 Console.Write("{0}",data[i].ToString("x2"));
481 480
482 if (data[i] < 127 && data[i] > 31) 481 if (data[i] < 127 && data[i] > 31)
483 buffer[i % Rest.DumpLineSize] = (char) data[i]; 482 buffer[i % DumpLineSize] = (char) data[i];
484 else 483 else
485 buffer[i % Rest.DumpLineSize] = '.'; 484 buffer[i % DumpLineSize] = '.';
486 485
487 cc++; 486 cc++;
488 487
489 if (i != 0 && (i + 1) % Rest.DumpLineSize == 0) 488 if (i != 0 && (i + 1) % DumpLineSize == 0)
490 { 489 {
491 Console.Write(" |"+(new String(buffer))+"|"); 490 Console.Write(" |"+(new String(buffer))+"|");
492 cc = 0; 491 cc = 0;
@@ -497,11 +496,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
497 496
498 if (cc != 0) 497 if (cc != 0)
499 { 498 {
500 for (int i = cc ; i < Rest.DumpLineSize; i++) 499 for (int i = cc ; i < DumpLineSize; i++)
501 { 500 {
502 if (i % 4 == 0) Console.Write(" "); 501 if (i % 4 == 0) Console.Write(" ");
503 Console.Write(" "); 502 Console.Write(" ");
504 buffer[i % Rest.DumpLineSize] = ' '; 503 buffer[i % DumpLineSize] = ' ';
505 } 504 }
506 Console.WriteLine(" |"+(new String(buffer))+"|"); 505 Console.WriteLine(" |"+(new String(buffer))+"|");
507 } 506 }
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index 0775007..667cf57 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -27,18 +27,10 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using System.IO;
32using System.Threading;
33using System.Xml; 30using System.Xml;
34using System.Drawing; 31using OpenMetaverse;
35using OpenSim.Framework; 32using OpenSim.Framework;
36using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
37using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache;
39using OpenMetaverse;
40using OpenMetaverse.Imaging;
41using Nini.Config;
42 34
43namespace OpenSim.ApplicationPlugins.Rest.Inventory 35namespace OpenSim.ApplicationPlugins.Rest.Inventory
44{ 36{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
index 241bc90..2996030 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
@@ -25,17 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenMetaverse;
29using Nini.Config;
30using System; 28using System;
31using System.Collections.Generic;
32using System.IO;
33using System.Threading;
34using System.Xml; 29using System.Xml;
30using OpenMetaverse;
35using OpenSim.Framework; 31using OpenSim.Framework;
36using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
37using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache;
39 33
40namespace OpenSim.ApplicationPlugins.Rest.Inventory 34namespace OpenSim.ApplicationPlugins.Rest.Inventory
41{ 35{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
index c022e09..81801df 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
@@ -28,9 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using OpenSim.Framework;
32using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
33using OpenSim.ApplicationPlugins.Rest;
34 32
35namespace OpenSim.ApplicationPlugins.Rest.Inventory 33namespace OpenSim.ApplicationPlugins.Rest.Inventory
36{ 34{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index aa222bb..853b004 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -27,18 +27,18 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing;
31using System.Globalization;
30using System.IO; 32using System.IO;
31using System.Threading; 33using System.Threading;
32using System.Xml;
33using System.Drawing;
34using System.Timers; 34using System.Timers;
35using OpenSim.Framework; 35using System.Xml;
36using OpenSim.Framework.Servers;
37using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache;
39using OpenMetaverse; 36using OpenMetaverse;
40using OpenMetaverse.Imaging; 37using OpenMetaverse.Imaging;
41using Nini.Config; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Servers;
41using Timer=System.Timers.Timer;
42 42
43namespace OpenSim.ApplicationPlugins.Rest.Inventory 43namespace OpenSim.ApplicationPlugins.Rest.Inventory
44{ 44{
@@ -1931,19 +1931,19 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1931 switch (ic.xml.Name) 1931 switch (ic.xml.Name)
1932 { 1932 {
1933 case "current": 1933 case "current":
1934 ic.CurrentPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); 1934 ic.CurrentPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
1935 break; 1935 break;
1936 case "next": 1936 case "next":
1937 ic.NextPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); 1937 ic.NextPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
1938 break; 1938 break;
1939 case "group": 1939 case "group":
1940 ic.GroupPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); 1940 ic.GroupPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
1941 break; 1941 break;
1942 case "everyone": 1942 case "everyone":
1943 ic.EveryOnePermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); 1943 ic.EveryOnePermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
1944 break; 1944 break;
1945 case "base": 1945 case "base":
1946 ic.BasePermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); 1946 ic.BasePermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
1947 break; 1947 break;
1948 default: 1948 default:
1949 Rest.Log.DebugFormat("{0} Permissions: invalid attribute {1}:{2}", 1949 Rest.Log.DebugFormat("{0} Permissions: invalid attribute {1}:{2}",
@@ -2176,7 +2176,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
2176 internal UserProfileData userProfile = null; 2176 internal UserProfileData userProfile = null;
2177 internal InventoryFolderBase root = null; 2177 internal InventoryFolderBase root = null;
2178 internal bool timeout = false; 2178 internal bool timeout = false;
2179 internal System.Timers.Timer watchDog = new System.Timers.Timer(); 2179 internal Timer watchDog = new Timer();
2180 2180
2181 internal InventoryRequestData(OSHttpRequest request, OSHttpResponse response, string prefix) 2181 internal InventoryRequestData(OSHttpRequest request, OSHttpResponse response, string prefix)
2182 : base(request, response, prefix) 2182 : base(request, response, prefix)
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
index b7c9027..1e87996 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
@@ -26,17 +26,10 @@
26 * 26 *
27 */ 27 */
28 28
29using OpenMetaverse;
30using Nini.Config;
31using System; 29using System;
32using System.IO;
33using System.Collections.Generic; 30using System.Collections.Generic;
34using System.Reflection; 31using System.Reflection;
35using System.Threading;
36using OpenSim.Framework;
37using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache;
40 33
41namespace OpenSim.ApplicationPlugins.Rest.Inventory 34namespace OpenSim.ApplicationPlugins.Rest.Inventory
42{ 35{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs
index a3f1d14..8c3ef75 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs
@@ -26,8 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using System;
30
31namespace OpenSim.ApplicationPlugins.Rest.Inventory 29namespace OpenSim.ApplicationPlugins.Rest.Inventory
32{ 30{
33 31
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
index 4a98834..c81cb9f 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
@@ -25,18 +25,9 @@
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 OpenMetaverse;
29using Nini.Config;
30using System; 28using System;
31using System.Collections.Generic; 29using OpenMetaverse;
32using System.IO;
33using System.Threading;
34using System.Xml;
35using OpenSim.Framework;
36using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache;
40 31
41namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests 32namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests
42{ 33{
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index 8537da5..959bae6e2 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -26,27 +26,12 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Threading;
30using System.Collections;
31using System.Collections.Generic;
32using System.IO; 29using System.IO;
33using System.Net;
34using System.Reflection;
35using System.Text.RegularExpressions;
36using System.Timers;
37using System.Xml;
38using System.Xml.Serialization; 30using System.Xml.Serialization;
39using OpenMetaverse; 31using OpenMetaverse;
40using Mono.Addins;
41using Nwc.XmlRpc;
42using Nini.Config;
43using OpenSim.Framework;
44using OpenSim.Framework.Console;
45using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
46using OpenSim.Framework.Communications;
47using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
49using OpenSim.ApplicationPlugins.Rest;
50 35
51namespace OpenSim.ApplicationPlugins.Rest.Regions 36namespace OpenSim.ApplicationPlugins.Rest.Regions
52{ 37{
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
index ab7e1ec..aa93f28 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
@@ -26,27 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Threading;
30using System.Collections;
31using System.Collections.Generic;
32using System.IO; 29using System.IO;
33using System.Net;
34using System.Reflection;
35using System.Text.RegularExpressions;
36using System.Timers;
37using System.Xml;
38using System.Xml.Serialization;
39using OpenMetaverse; 30using OpenMetaverse;
40using Mono.Addins;
41using Nwc.XmlRpc;
42using Nini.Config;
43using OpenSim.Framework;
44using OpenSim.Framework.Console;
45using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
46using OpenSim.Framework.Communications;
47using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
49using OpenSim.ApplicationPlugins.Rest;
50 34
51namespace OpenSim.ApplicationPlugins.Rest.Regions 35namespace OpenSim.ApplicationPlugins.Rest.Regions
52{ 36{
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
index 80c2aa3..b3815fa 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
@@ -25,13 +25,10 @@
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 OpenMetaverse;
29using System; 28using System;
30using System.Collections;
31using System.Collections.Generic;
32using System.Xml.Serialization; 29using System.Xml.Serialization;
30using OpenMetaverse;
33using OpenSim.Framework; 31using OpenSim.Framework;
34using OpenSim.Region.Framework.Scenes;
35 32
36namespace OpenSim.ApplicationPlugins.Rest.Regions 33namespace OpenSim.ApplicationPlugins.Rest.Regions
37{ 34{
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
index 2d13b6b..fdfeb7d 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
@@ -26,25 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Threading;
30using System.Collections;
31using System.Collections.Generic;
32using System.IO;
33using System.Net;
34using System.Reflection;
35using System.Text.RegularExpressions;
36using System.Timers;
37using System.Xml;
38using System.Xml.Serialization; 29using System.Xml.Serialization;
39using OpenMetaverse;
40using Nwc.XmlRpc;
41using Nini.Config;
42using OpenSim.Framework;
43using OpenSim.Framework.Console;
44using OpenSim.Framework.Servers;
45using OpenSim.Framework.Communications;
46using OpenSim.Region.Framework.Scenes;
47using OpenSim.ApplicationPlugins.Rest;
48 30
49namespace OpenSim.ApplicationPlugins.Rest.Regions 31namespace OpenSim.ApplicationPlugins.Rest.Regions
50{ 32{
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index 58dd729..86de6de 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -26,22 +26,15 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Threading;
30using System.Collections;
31using System.Collections.Generic; 29using System.Collections.Generic;
32using System.IO; 30using System.IO;
33using System.Net;
34using System.Reflection; 31using System.Reflection;
35using System.Timers;
36using System.Xml; 32using System.Xml;
37using OpenMetaverse; 33using log4net;
38using Nwc.XmlRpc;
39using Nini.Config; 34using Nini.Config;
35using OpenMetaverse;
40using OpenSim.Framework; 36using OpenSim.Framework;
41using OpenSim.Framework.Console;
42using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
43using OpenSim.Framework.Communications;
44using OpenSim.Region.Framework.Scenes;
45 38
46namespace OpenSim.ApplicationPlugins.Rest 39namespace OpenSim.ApplicationPlugins.Rest
47{ 40{
@@ -49,8 +42,8 @@ namespace OpenSim.ApplicationPlugins.Rest
49 { 42 {
50 #region properties 43 #region properties
51 44
52 protected static readonly log4net.ILog m_log = 45 protected static readonly ILog m_log =
53 log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
54 47
55 private IConfig _config; // Configuration source: Rest Plugins 48 private IConfig _config; // Configuration source: Rest Plugins
56 private IConfig _pluginConfig; // Configuration source: Plugin specific 49 private IConfig _pluginConfig; // Configuration source: Plugin specific
@@ -65,7 +58,7 @@ namespace OpenSim.ApplicationPlugins.Rest
65 private string _godkey; 58 private string _godkey;
66 private int _reqk; 59 private int _reqk;
67 60
68 [ThreadStaticAttribute] 61 [ThreadStatic]
69 private static string _threadRequestID = String.Empty; 62 private static string _threadRequestID = String.Empty;
70 63
71 /// <summary> 64 /// <summary>
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs
index a93f89c..7f16a04 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4 3
5// General Information about an assembly is controlled through the following 4// General Information about an assembly is controlled through the following
@@ -10,7 +9,7 @@ using System.Runtime.InteropServices;
10[assembly: AssemblyConfiguration("")] 9[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("Microsoft")] 10[assembly: AssemblyCompany("Microsoft")]
12[assembly: AssemblyProduct("OpenSim.ApplicationPlugins.ScriptEngine")] 11[assembly: AssemblyProduct("OpenSim.ApplicationPlugins.ScriptEngine")]
13[assembly: AssemblyCopyright("Copyright © Microsoft 2008")] 12[assembly: AssemblyCopyright("Copyright © Microsoft 2008")]
14[assembly: AssemblyTrademark("")] 13[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 14[assembly: AssemblyCulture("")]
16 15
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs
index bc07ca7..edec35f 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,9 +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 */
27using System; 27using System;
28using System.Collections.Generic;
29using System.Reflection; 28using System.Reflection;
30using System.Text;
31using log4net; 29using log4net;
32using Nini.Config; 30using Nini.Config;
33using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs b/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs
index ae4e2f9..b4b5d5b 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -24,8 +24,6 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System;
28using System.Collections.Generic;
29using System.Reflection; 27using System.Reflection;
30using log4net; 28using log4net;
31 29
diff --git a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
index 9211747..f992c16 100644
--- a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
+++ b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
@@ -25,8 +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 System.Data.SqlClient;
29using System.Data; 28using System.Data;
29using System.Data.SqlClient;
30 30
31namespace OpenSim.Data.MSSQL 31namespace OpenSim.Data.MSSQL
32{ 32{
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index 425e233..27deef7 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse;
32using log4net; 31using log4net;
32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34 34
35namespace OpenSim.Data.MSSQL 35namespace OpenSim.Data.MSSQL
@@ -71,7 +71,7 @@ namespace OpenSim.Data.MSSQL
71 /// <param name="connectionString">connect string</param> 71 /// <param name="connectionString">connect string</param>
72 override public void Initialise(string connectionString) 72 override public void Initialise(string connectionString)
73 { 73 {
74 TicksToEpoch = new System.DateTime(1970, 1, 1).Ticks; 74 TicksToEpoch = new DateTime(1970, 1, 1).Ticks;
75 75
76 if (!string.IsNullOrEmpty(connectionString)) 76 if (!string.IsNullOrEmpty(connectionString))
77 { 77 {
@@ -162,7 +162,7 @@ namespace OpenSim.Data.MSSQL
162 " VALUES " + 162 " VALUES " +
163 "(@id, @name, @description, @assetType, @local, @temporary, @create_time, @access_time, @data)")) 163 "(@id, @name, @description, @assetType, @local, @temporary, @create_time, @access_time, @data)"))
164 { 164 {
165 int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000); 165 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
166 command.Parameters.Add(database.CreateParameter("id", asset.Metadata.FullID)); 166 command.Parameters.Add(database.CreateParameter("id", asset.Metadata.FullID));
167 command.Parameters.Add(database.CreateParameter("name", asset.Metadata.Name)); 167 command.Parameters.Add(database.CreateParameter("name", asset.Metadata.Name));
168 command.Parameters.Add(database.CreateParameter("description", asset.Metadata.Description)); 168 command.Parameters.Add(database.CreateParameter("description", asset.Metadata.Description));
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index 8fd47a0..815e7ff 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -30,8 +30,8 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection; 32using System.Reflection;
33using OpenMetaverse;
34using log4net; 33using log4net;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37 37
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 7c7a886..eec2091 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection; 32using System.Reflection;
33using OpenMetaverse;
34using log4net; 33using log4net;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 764b89d..f367d78 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection; 32using System.Reflection;
33using OpenMetaverse;
34using log4net; 33using log4net;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 562fbad..c687c89 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -31,8 +31,8 @@ using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using OpenMetaverse;
35using log4net; 34using log4net;
35using OpenMetaverse;
36 36
37namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
38{ 38{
@@ -219,7 +219,7 @@ namespace OpenSim.Data.MSSQL
219 { 219 {
220 return value.ToString(); 220 return value.ToString();
221 } 221 }
222 if (valueType == typeof(OpenMetaverse.UUID)) 222 if (valueType == typeof(UUID))
223 { 223 {
224 return value.ToString(); 224 return value.ToString();
225 } 225 }
diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/MSSQL/MSSQLMigration.cs
index baa25d5..aea31c9 100644
--- a/OpenSim/Data/MSSQL/MSSQLMigration.cs
+++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs
@@ -26,11 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Data; 29using System.Data;
31using System.Data.Common; 30using System.Data.Common;
32using System.Reflection; 31using System.Reflection;
33using System.Text;
34 32
35namespace OpenSim.Data.MSSQL 33namespace OpenSim.Data.MSSQL
36{ 34{
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index d77afc9..44b042e 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -32,8 +32,8 @@ using System.Data.SqlClient;
32using System.Drawing; 32using System.Drawing;
33using System.IO; 33using System.IO;
34using System.Reflection; 34using System.Reflection;
35using OpenMetaverse;
36using log4net; 35using log4net;
36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 4524736..453941f 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -31,8 +31,8 @@ using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.Data.SqlClient; 32using System.Data.SqlClient;
33using System.Reflection; 33using System.Reflection;
34using OpenMetaverse;
35using log4net; 34using log4net;
35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37 37
38namespace OpenSim.Data.MSSQL 38namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index a9945b6..cbab546 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Data
70 70
71 public class Migration 71 public class Migration
72 { 72 {
73 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 73 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
74 74
75 private string _type; 75 private string _type;
76 private DbConnection _conn; 76 private DbConnection _conn;
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 823fa78..508e053 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -26,15 +26,13 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Data; 29using System.Data;
31using System.Reflection; 30using System.Reflection;
32using OpenMetaverse;
33using log4net; 31using log4net;
34using MySql.Data.MySqlClient; 32using MySql.Data.MySqlClient;
33using OpenMetaverse;
35using OpenSim.Framework; 34using OpenSim.Framework;
36 35
37
38namespace OpenSim.Data.MySQL 36namespace OpenSim.Data.MySQL
39{ 37{
40 /// <summary> 38 /// <summary>
@@ -62,7 +60,7 @@ namespace OpenSim.Data.MySQL
62 /// <param name="connect">connect string</param> 60 /// <param name="connect">connect string</param>
63 override public void Initialise(string connect) 61 override public void Initialise(string connect)
64 { 62 {
65 TicksToEpoch = new System.DateTime(1970,1,1).Ticks; 63 TicksToEpoch = new DateTime(1970,1,1).Ticks;
66 64
67 // TODO: This will let you pass in the connect string in 65 // TODO: This will let you pass in the connect string in
68 // the config, though someone will need to write that. 66 // the config, though someone will need to write that.
@@ -145,7 +143,7 @@ namespace OpenSim.Data.MySQL
145 { 143 {
146 asset.Metadata.Local = (bool)dbReader["local"]; 144 asset.Metadata.Local = (bool)dbReader["local"];
147 } 145 }
148 catch (System.InvalidCastException) 146 catch (InvalidCastException)
149 { 147 {
150 asset.Metadata.Local = false; 148 asset.Metadata.Local = false;
151 } 149 }
@@ -199,7 +197,7 @@ namespace OpenSim.Data.MySQL
199 using (cmd) 197 using (cmd)
200 { 198 {
201 // create unix epoch time 199 // create unix epoch time
202 int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000); 200 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
203 cmd.Parameters.AddWithValue("?id", asset.Metadata.ID); 201 cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
204 cmd.Parameters.AddWithValue("?name", asset.Metadata.Name); 202 cmd.Parameters.AddWithValue("?name", asset.Metadata.Name);
205 cmd.Parameters.AddWithValue("?description", asset.Metadata.Description); 203 cmd.Parameters.AddWithValue("?description", asset.Metadata.Description);
@@ -240,7 +238,7 @@ namespace OpenSim.Data.MySQL
240 using (cmd) 238 using (cmd)
241 { 239 {
242 // create unix epoch time 240 // create unix epoch time
243 int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000); 241 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
244 cmd.Parameters.AddWithValue("?id", asset.Metadata.ID); 242 cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
245 cmd.Parameters.AddWithValue("?access_time", now); 243 cmd.Parameters.AddWithValue("?access_time", now);
246 cmd.ExecuteNonQuery(); 244 cmd.ExecuteNonQuery();
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index f811d84..5acbb9d 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -28,15 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.IO;
32using System.Reflection; 31using System.Reflection;
33using System.Threading;
34using OpenMetaverse;
35using log4net; 32using log4net;
36using MySql.Data.MySqlClient; 33using MySql.Data.MySqlClient;
34using OpenMetaverse;
37using OpenSim.Framework; 35using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes;
40 37
41namespace OpenSim.Data.MySQL 38namespace OpenSim.Data.MySQL
42{ 39{
@@ -131,7 +128,7 @@ namespace OpenSim.Data.MySQL
131 cmd.Dispose(); 128 cmd.Dispose();
132 } 129 }
133 130
134 m_lastConnectionUse = System.DateTime.Now.Ticks; 131 m_lastConnectionUse = DateTime.Now.Ticks;
135 132
136 m_log.DebugFormat( 133 m_log.DebugFormat(
137 "[REGION DB]: Connection wait timeout {0} seconds", 134 "[REGION DB]: Connection wait timeout {0} seconds",
@@ -140,7 +137,7 @@ namespace OpenSim.Data.MySQL
140 137
141 protected void CheckConnection() 138 protected void CheckConnection()
142 { 139 {
143 long timeNow = System.DateTime.Now.Ticks; 140 long timeNow = DateTime.Now.Ticks;
144 if (timeNow - m_lastConnectionUse > m_waitTimeout || 141 if (timeNow - m_lastConnectionUse > m_waitTimeout ||
145 m_connection.State != ConnectionState.Open) 142 m_connection.State != ConnectionState.Open)
146 { 143 {
@@ -185,7 +182,7 @@ namespace OpenSim.Data.MySQL
185 else 182 else
186 m_FieldMap[name].SetValue(es, false); 183 m_FieldMap[name].SetValue(es, false);
187 } 184 }
188 else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) 185 else if (m_FieldMap[name].GetValue(es) is UUID)
189 { 186 {
190 UUID uuid = UUID.Zero; 187 UUID uuid = UUID.Zero;
191 188
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 437747b..5c00330 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -29,8 +29,9 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse; 32using System.Threading;
33using log4net; 33using log4net;
34using OpenMetaverse;
34using OpenSim.Framework; 35using OpenSim.Framework;
35 36
36namespace OpenSim.Data.MySQL 37namespace OpenSim.Data.MySQL
@@ -78,7 +79,7 @@ namespace OpenSim.Data.MySQL
78 if (lockedCons > m_maxConnections) 79 if (lockedCons > m_maxConnections)
79 { 80 {
80 lockedCons = 0; 81 lockedCons = 0;
81 System.Threading.Thread.Sleep(1000); // Wait some time before searching them again. 82 Thread.Sleep(1000); // Wait some time before searching them again.
82 m_log.Debug( 83 m_log.Debug(
83 "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound."); 84 "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
84 } 85 }
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index efc781d..7d29061 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse;
32using log4net; 31using log4net;
33using MySql.Data.MySqlClient; 32using MySql.Data.MySqlClient;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35 35
36namespace OpenSim.Data.MySQL 36namespace OpenSim.Data.MySQL
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
index c02016c..13361af 100644
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -25,8 +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 System.Reflection;
29using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
30using log4net; 30using log4net;
31using OpenSim.Framework; 31using OpenSim.Framework;
32 32
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index f16795e..3bb6857 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -26,14 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using OpenMetaverse;
35using log4net; 34using log4net;
36using MySql.Data.MySqlClient; 35using MySql.Data.MySqlClient;
36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38 38
39namespace OpenSim.Data.MySQL 39namespace OpenSim.Data.MySQL
@@ -148,7 +148,7 @@ namespace OpenSim.Data.MySQL
148 cmd.Dispose(); 148 cmd.Dispose();
149 } 149 }
150 150
151 m_lastConnectionUse = System.DateTime.Now.Ticks; 151 m_lastConnectionUse = DateTime.Now.Ticks;
152 152
153 m_log.DebugFormat( 153 m_log.DebugFormat(
154 "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond); 154 "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond);
@@ -161,7 +161,7 @@ namespace OpenSim.Data.MySQL
161 { 161 {
162 //m_log.Debug("[REGION DB]: Checking connection"); 162 //m_log.Debug("[REGION DB]: Checking connection");
163 163
164 long timeNow = System.DateTime.Now.Ticks; 164 long timeNow = DateTime.Now.Ticks;
165 if (timeNow - m_lastConnectionUse > m_waitTimeout || dbcon.State != ConnectionState.Open) 165 if (timeNow - m_lastConnectionUse > m_waitTimeout || dbcon.State != ConnectionState.Open)
166 { 166 {
167 m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting"); 167 m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting");
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index ab55ba5..4b07ed6 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -28,13 +28,13 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Drawing;
31using System.IO; 32using System.IO;
32using System.Reflection; 33using System.Reflection;
33using System.Threading; 34using System.Threading;
34using System.Drawing;
35using OpenMetaverse;
36using log4net; 35using log4net;
37using MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
37using OpenMetaverse;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
@@ -89,7 +89,7 @@ namespace OpenSim.Data.MySQL
89 } 89 }
90 catch (Exception) 90 catch (Exception)
91 { 91 {
92 System.Threading.Thread.Sleep(500); 92 Thread.Sleep(500);
93 93
94 m_Connection.Close(); 94 m_Connection.Close();
95 m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone(); 95 m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
@@ -122,7 +122,7 @@ namespace OpenSim.Data.MySQL
122 } 122 }
123 catch (Exception) 123 catch (Exception)
124 { 124 {
125 System.Threading.Thread.Sleep(500); 125 Thread.Sleep(500);
126 126
127 m_Connection.Close(); 127 m_Connection.Close();
128 m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone(); 128 m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index f6a9af3..0f167b2 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -31,8 +31,9 @@ using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using OpenMetaverse; 34using System.Threading;
35using log4net; 35using log4net;
36using OpenMetaverse;
36using OpenSim.Framework; 37using OpenSim.Framework;
37 38
38namespace OpenSim.Data.MySQL 39namespace OpenSim.Data.MySQL
@@ -93,7 +94,7 @@ namespace OpenSim.Data.MySQL
93 if (lockedCons > m_maxConnections) 94 if (lockedCons > m_maxConnections)
94 { 95 {
95 lockedCons = 0; 96 lockedCons = 0;
96 System.Threading.Thread.Sleep(1000); // Wait some time before searching them again. 97 Thread.Sleep(1000); // Wait some time before searching them again.
97 m_log.Debug( 98 m_log.Debug(
98 "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound."); 99 "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
99 m_log.Debug("Current connections-in-use dump:"); 100 m_log.Debug("Current connections-in-use dump:");
diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
index 0f7c9cd..d03e66c 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
index bee3d04..f148385 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
40{ 33{
@@ -63,7 +56,7 @@ namespace OpenSim.Data.MySQL.Tests
63 } 56 }
64 catch (Exception e) 57 catch (Exception e)
65 { 58 {
66 System.Console.WriteLine("Exception {0}", e); 59 Console.WriteLine("Exception {0}", e);
67 Assert.Ignore(); 60 Assert.Ignore();
68 } 61 }
69 } 62 }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
index 4638bca..953294f 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
index 8c7d820..e03e38d 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -26,16 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38using log4net;
39 31
40namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
41{ 33{
@@ -62,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
62 } 54 }
63 catch (Exception e) 55 catch (Exception e)
64 { 56 {
65 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 58 Assert.Ignore();
67 } 59 }
68 } 60 }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
index 71e73c2..5cce53b 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
index 8448dd7..b74617e 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/ColorUserType.cs b/OpenSim/Data/NHibernate/ColorUserType.cs
index 1ebd07c..955a442 100644
--- a/OpenSim/Data/NHibernate/ColorUserType.cs
+++ b/OpenSim/Data/NHibernate/ColorUserType.cs
@@ -27,12 +27,10 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse; 30using System.Drawing;
31using OpenSim.Framework;
32using NHibernate; 31using NHibernate;
33using NHibernate.SqlTypes; 32using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 33using NHibernate.UserTypes;
35using System.Drawing;
36 34
37namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
38{ 36{
diff --git a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
index 0cd5c6f..589d1e3 100644
--- a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
+++ b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
@@ -27,10 +27,10 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using NHibernate; 30using NHibernate;
32using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 32using NHibernate.UserTypes;
33using OpenMetaverse;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
diff --git a/OpenSim/Data/NHibernate/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
index a7781a3..5d62ef3 100644
--- a/OpenSim/Data/NHibernate/LLUUIDUserType.cs
+++ b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
@@ -27,10 +27,10 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using NHibernate; 30using NHibernate;
32using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 32using NHibernate.UserTypes;
33using OpenMetaverse;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs
index 25a2bc6..75b522f 100644
--- a/OpenSim/Data/NHibernate/LLVector3UserType.cs
+++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs
@@ -27,10 +27,10 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using NHibernate; 30using NHibernate;
32using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 32using NHibernate.UserTypes;
33using OpenMetaverse;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index d0046c6..f4527bf 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -25,16 +25,10 @@
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;
29using System.Collections;
30using System.IO;
31using System.Reflection; 28using System.Reflection;
32using System.Text.RegularExpressions;
33using OpenMetaverse;
34using log4net; 29using log4net;
35using NHibernate; 30using OpenMetaverse;
36using OpenSim.Framework; 31using OpenSim.Framework;
37using Environment=NHibernate.Cfg.Environment;
38 32
39namespace OpenSim.Data.NHibernate 33namespace OpenSim.Data.NHibernate
40{ 34{
diff --git a/OpenSim/Data/NHibernate/NHibernateGridData.cs b/OpenSim/Data/NHibernate/NHibernateGridData.cs
index 07d9ab5..836c99e 100644
--- a/OpenSim/Data/NHibernate/NHibernateGridData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateGridData.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -27,15 +27,14 @@
27 27
28 28
29using System; 29using System;
30using System.Collections;
30using System.Collections.Generic; 31using System.Collections.Generic;
31using System.Text;
32using log4net;
33using System.Reflection; 32using System.Reflection;
34using OpenSim.Framework; 33using log4net;
35using NHibernate; 34using NHibernate;
36using NHibernate.Criterion; 35using NHibernate.Criterion;
37using System.Collections;
38using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework;
39 38
40namespace OpenSim.Data.NHibernate 39namespace OpenSim.Data.NHibernate
41{ 40{
@@ -93,7 +92,7 @@ namespace OpenSim.Data.NHibernate
93 } 92 }
94 } 93 }
95 94
96 public override bool AuthenticateSim(OpenMetaverse.UUID UUID, ulong regionHandle, string simrecvkey) 95 public override bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey)
97 { 96 {
98 bool throwHissyFit = false; // Should be true by 1.0 97 bool throwHissyFit = false; // Should be true by 1.0
99 98
@@ -147,7 +146,7 @@ namespace OpenSim.Data.NHibernate
147 return DataResponse.RESPONSE_ERROR; 146 return DataResponse.RESPONSE_ERROR;
148 } 147 }
149 148
150 public override RegionProfileData GetProfileByUUID(OpenMetaverse.UUID UUID) 149 public override RegionProfileData GetProfileByUUID(UUID UUID)
151 { 150 {
152 return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID); 151 return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID);
153 } 152 }
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index e648396..0129800 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -27,15 +27,12 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
31using System.Reflection; 30using System.Reflection;
32using System.Text.RegularExpressions;
33using OpenMetaverse;
34using log4net; 31using log4net;
35using NHibernate; 32using NHibernate;
36using NHibernate.Criterion; 33using NHibernate.Criterion;
34using OpenMetaverse;
37using OpenSim.Framework; 35using OpenSim.Framework;
38using Environment=NHibernate.Cfg.Environment;
39 36
40namespace OpenSim.Data.NHibernate 37namespace OpenSim.Data.NHibernate
41{ 38{
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs
index 5e5eb47..51467da 100644
--- a/OpenSim/Data/NHibernate/NHibernateManager.cs
+++ b/OpenSim/Data/NHibernate/NHibernateManager.cs
@@ -26,14 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Data.Common;
29using System.Reflection; 30using System.Reflection;
30using System.IO;
31using log4net; 31using log4net;
32using NHibernate; 32using NHibernate;
33using NHibernate.Cfg; 33using NHibernate.Cfg;
34using NHibernate.Tool.hbm2ddl; 34using NHibernate.Tool.hbm2ddl;
35using OpenMetaverse; 35using OpenMetaverse;
36using Environment = NHibernate.Cfg.Environment; 36using Environment=NHibernate.Cfg.Environment;
37 37
38namespace OpenSim.Data.NHibernate 38namespace OpenSim.Data.NHibernate
39{ 39{
@@ -92,7 +92,7 @@ namespace OpenSim.Data.NHibernate
92 migrationSubType = "MySQLDialect"; 92 migrationSubType = "MySQLDialect";
93 } 93 }
94 94
95 Migration migration = new Migration((System.Data.Common.DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store); 95 Migration migration = new Migration((DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store);
96 migration.Update(); 96 migration.Update();
97 } 97 }
98 98
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 29f4106..0cd3969 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -26,19 +26,15 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.IO;
32using System.Reflection; 30using System.Reflection;
33using System.Text.RegularExpressions;
34using OpenMetaverse;
35using log4net; 31using log4net;
36using NHibernate; 32using NHibernate;
37using NHibernate.Criterion; 33using NHibernate.Criterion;
34using OpenMetaverse;
38using OpenSim.Framework; 35using OpenSim.Framework;
39using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
41using Environment = NHibernate.Cfg.Environment;
42 38
43namespace OpenSim.Data.NHibernate 39namespace OpenSim.Data.NHibernate
44{ 40{
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index c739c86..7dfdcb5 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -25,17 +25,13 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.IO;
31using System.Reflection; 29using System.Reflection;
32using System.Text.RegularExpressions;
33using OpenMetaverse;
34using log4net; 30using log4net;
35using NHibernate; 31using NHibernate;
36using NHibernate.Criterion; 32using NHibernate.Criterion;
33using OpenMetaverse;
37using OpenSim.Framework; 34using OpenSim.Framework;
38using Environment=NHibernate.Cfg.Environment;
39 35
40namespace OpenSim.Data.NHibernate 36namespace OpenSim.Data.NHibernate
41{ 37{
diff --git a/OpenSim/Data/NHibernate/SByteType.cs b/OpenSim/Data/NHibernate/SByteType.cs
index 0d8431d..f41cb33 100644
--- a/OpenSim/Data/NHibernate/SByteType.cs
+++ b/OpenSim/Data/NHibernate/SByteType.cs
@@ -27,8 +27,6 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using OpenSim.Framework;
32using NHibernate; 30using NHibernate;
33using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 32using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/Terrain.cs b/OpenSim/Data/NHibernate/Terrain.cs
index 88be17f..292b3b4 100644
--- a/OpenSim/Data/NHibernate/Terrain.cs
+++ b/OpenSim/Data/NHibernate/Terrain.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using OpenSim.Framework;
32using log4net; 31using log4net;
33using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
index d6c7f8f..8296556 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 55 }
63 catch (Exception e) 56 catch (Exception e)
64 { 57 {
65 System.Console.WriteLine("Exception {0}", e); 58 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 59 Assert.Ignore();
67 } 60 }
68 } 61 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
index e70b32b..9aa1ba8 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse;
37using OpenSim.Data.NHibernate;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
index 7500574..c3c2c93 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
@@ -26,16 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38using log4net;
39 31
40namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
41{ 33{
@@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 54 }
63 catch (Exception e) 55 catch (Exception e)
64 { 56 {
65 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 58 Assert.Ignore();
67 } 59 }
68 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
index add8883..5cf0a5b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 55 }
63 catch (Exception e) 56 catch (Exception e)
64 { 57 {
65 System.Console.WriteLine("Exception {0}", e); 58 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 59 Assert.Ignore();
67 } 60 }
68 } 61 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
index 01b0236..2b0da74 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
index 93b92ed..96194c6 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
index c845d2c..60b197c 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse;
37using OpenSim.Data.NHibernate;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
index f91d058..8415fdf 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
@@ -26,16 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38using log4net;
39 31
40namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
41{ 33{
@@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 54 }
63 catch (Exception e) 55 catch (Exception e)
64 { 56 {
65 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 58 Assert.Ignore();
67 } 59 }
68 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
index 4db8375..89ab928 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 55 }
63 catch (Exception e) 56 catch (Exception e)
64 { 57 {
65 System.Console.WriteLine("Exception {0}", e); 58 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 59 Assert.Ignore();
67 } 60 }
68 } 61 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
index 3bc0f4b..a50df9b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
index 50632d1..33a36e6 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
@@ -26,14 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenMetaverse;
37 31
38namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
39{ 33{
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
60 } 54 }
61 catch (Exception e) 55 catch (Exception e)
62 { 56 {
63 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
64 Assert.Ignore(); 58 Assert.Ignore();
65 } 59 }
66 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
index a6e9891..93f1ee1 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
@@ -26,14 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenMetaverse;
36using OpenSim.Data.NHibernate;
37 31
38namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
39{ 33{
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
60 } 54 }
61 catch (Exception e) 55 catch (Exception e)
62 { 56 {
63 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
64 Assert.Ignore(); 58 Assert.Ignore();
65 } 59 }
66 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
index 057996b..afad336 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenMetaverse;
37using log4net;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
index 4fc89f8..9967af7 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
@@ -26,14 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenMetaverse;
37 31
38namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
39{ 33{
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
60 } 54 }
61 catch (Exception e) 55 catch (Exception e)
62 { 56 {
63 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
64 Assert.Ignore(); 58 Assert.Ignore();
65 } 59 }
66 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
index 1abf97b..0edfdcb 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
@@ -26,14 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenMetaverse;
37 31
38namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
39{ 33{
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
60 } 54 }
61 catch (Exception e) 55 catch (Exception e)
62 { 56 {
63 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
64 Assert.Ignore(); 58 Assert.Ignore();
65 } 59 }
66 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
index 77bbb08..cc4915b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
@@ -27,14 +27,8 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 30using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 32
39namespace OpenSim.Data.NHibernate.Tests 33namespace OpenSim.Data.NHibernate.Tests
40{ 34{
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 56 }
63 catch (Exception e) 57 catch (Exception e)
64 { 58 {
65 System.Console.WriteLine("Exception {0}", e); 59 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 60 Assert.Ignore();
67 } 61 }
68 } 62 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
index 6e7d7af..a358b27 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
@@ -27,14 +27,8 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 30using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse;
37using OpenSim.Data.NHibernate;
38 32
39namespace OpenSim.Data.NHibernate.Tests 33namespace OpenSim.Data.NHibernate.Tests
40{ 34{
@@ -61,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 55 }
62 catch (Exception e) 56 catch (Exception e)
63 { 57 {
64 System.Console.WriteLine("Exception {0}", e); 58 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 59 Assert.Ignore();
66 } 60 }
67 } 61 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
index 45c77f7..297a661 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
@@ -27,15 +27,8 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 30using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38using log4net;
39 32
40namespace OpenSim.Data.NHibernate.Tests 33namespace OpenSim.Data.NHibernate.Tests
41{ 34{
@@ -63,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
63 } 56 }
64 catch (Exception e) 57 catch (Exception e)
65 { 58 {
66 System.Console.WriteLine("Exception {0}", e); 59 Console.WriteLine("Exception {0}", e);
67 Assert.Ignore(); 60 Assert.Ignore();
68 } 61 }
69 } 62 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
index 6e84110..f188736 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
@@ -27,14 +27,8 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 30using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 32
39namespace OpenSim.Data.NHibernate.Tests 33namespace OpenSim.Data.NHibernate.Tests
40{ 34{
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 56 }
63 catch (Exception e) 57 catch (Exception e)
64 { 58 {
65 System.Console.WriteLine("Exception {0}", e); 59 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 60 Assert.Ignore();
67 } 61 }
68 } 62 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
index 90edbc2..d94dac0 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
@@ -27,14 +27,8 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 30using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 32
39namespace OpenSim.Data.NHibernate.Tests 33namespace OpenSim.Data.NHibernate.Tests
40{ 34{
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 56 }
63 catch (Exception e) 57 catch (Exception e)
64 { 58 {
65 System.Console.WriteLine("Exception {0}", e); 59 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 60 Assert.Ignore();
67 } 61 }
68 } 62 }
diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs
index ff949d4..57a580d 100644
--- a/OpenSim/Data/NHibernate/TextureUserType.cs
+++ b/OpenSim/Data/NHibernate/TextureUserType.cs
@@ -27,11 +27,11 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using OpenSim.Framework;
32using NHibernate; 30using NHibernate;
33using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 32using NHibernate.UserTypes;
33using OpenMetaverse;
34using OpenSim.Framework;
35 35
36namespace OpenSim.Data.NHibernate 36namespace OpenSim.Data.NHibernate
37{ 37{
diff --git a/OpenSim/Data/NHibernate/UInt16Type.cs b/OpenSim/Data/NHibernate/UInt16Type.cs
index b805288..907e832 100644
--- a/OpenSim/Data/NHibernate/UInt16Type.cs
+++ b/OpenSim/Data/NHibernate/UInt16Type.cs
@@ -27,8 +27,6 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using OpenSim.Framework;
32using NHibernate; 30using NHibernate;
33using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 32using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/UInt32Type.cs b/OpenSim/Data/NHibernate/UInt32Type.cs
index 2500194..2b4c24a 100644
--- a/OpenSim/Data/NHibernate/UInt32Type.cs
+++ b/OpenSim/Data/NHibernate/UInt32Type.cs
@@ -27,8 +27,6 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using OpenSim.Framework;
32using NHibernate; 30using NHibernate;
33using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 32using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/UInt64Type.cs b/OpenSim/Data/NHibernate/UInt64Type.cs
index 304c9371..362e62d 100644
--- a/OpenSim/Data/NHibernate/UInt64Type.cs
+++ b/OpenSim/Data/NHibernate/UInt64Type.cs
@@ -27,8 +27,6 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using OpenSim.Framework;
32using NHibernate; 30using NHibernate;
33using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 32using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/UserFriend.cs b/OpenSim/Data/NHibernate/UserFriend.cs
index ab6cd78..589acd1 100644
--- a/OpenSim/Data/NHibernate/UserFriend.cs
+++ b/OpenSim/Data/NHibernate/UserFriend.cs
@@ -25,9 +25,6 @@
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;
29using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Data.NHibernate 30namespace OpenSim.Data.NHibernate
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 0ec79ac..d01aaa0 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -27,8 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using OpenMetaverse;
31using Nwc.XmlRpc; 30using Nwc.XmlRpc;
31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33 33
34namespace OpenSim.Data 34namespace OpenSim.Data
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index d28956f..f6f62a7 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse;
32using log4net; 31using log4net;
33using Mono.Data.SqliteClient; 32using Mono.Data.SqliteClient;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 46d29a3..3fb33c2 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -28,15 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.IO;
32using System.Reflection; 31using System.Reflection;
33using System.Threading;
34using OpenMetaverse;
35using Mono.Data.SqliteClient;
36using log4net; 32using log4net;
33using Mono.Data.SqliteClient;
34using OpenMetaverse;
37using OpenSim.Framework; 35using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes;
40 37
41namespace OpenSim.Data.SQLite 38namespace OpenSim.Data.SQLite
42{ 39{
@@ -109,7 +106,7 @@ namespace OpenSim.Data.SQLite
109 else 106 else
110 m_FieldMap[name].SetValue(es, false); 107 m_FieldMap[name].SetValue(es, false);
111 } 108 }
112 else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) 109 else if (m_FieldMap[name].GetValue(es) is UUID)
113 { 110 {
114 UUID uuid = UUID.Zero; 111 UUID uuid = UUID.Zero;
115 112
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 5b0455d..6c7c58c 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -29,10 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using System.Security.Cryptography;
33using System.Text;
34using OpenMetaverse;
35using log4net; 32using log4net;
33using OpenMetaverse;
36using OpenSim.Framework; 34using OpenSim.Framework;
37 35
38namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index c497396..6391c6d 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -29,9 +29,9 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
34using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Data.SQLite 37namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index a936ec1..4d45d08 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SQLite; 31using System.Data.SQLite;
32using System.Reflection; 32using System.Reflection;
33using OpenMetaverse;
34using log4net; 33using log4net;
34using OpenMetaverse;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
37{ 37{
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 89308db..7ec4ceb 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -28,13 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Drawing;
31using System.IO; 32using System.IO;
32using System.Reflection; 33using System.Reflection;
33using System.Threading;
34using System.Drawing;
35using OpenMetaverse;
36using log4net; 34using log4net;
37using Mono.Data.SqliteClient; 35using Mono.Data.SqliteClient;
36using OpenMetaverse;
38using OpenSim.Framework; 37using OpenSim.Framework;
39using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 1c36453..788a9ea 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -29,9 +29,9 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
34using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Data.SQLite 37namespace OpenSim.Data.SQLite
@@ -645,7 +645,7 @@ namespace OpenSim.Data.SQLite
645 try { 645 try {
646 aa = aplist[user]; 646 aa = aplist[user];
647 m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString()); 647 m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
648 } catch (System.Collections.Generic.KeyNotFoundException) { 648 } catch (KeyNotFoundException) {
649 m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString()); 649 m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString());
650 } 650 }
651 return aa; 651 return aa;
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
index 0de965d..60aa1f3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -25,16 +25,9 @@
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;
29using System.IO; 28using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
58 public void Cleanup() 51 public void Cleanup()
59 { 52 {
60 db.Dispose(); 53 db.Dispose();
61 System.IO.File.Delete(file); 54 File.Delete(file);
62 } 55 }
63 } 56 }
64} \ No newline at end of file 57} \ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
index 31efcc3..774cca1 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
@@ -25,16 +25,9 @@
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;
29using System.IO; 28using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 07b0dab..70903c3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -25,17 +25,9 @@
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;
29using System.IO; 28using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38using log4net;
39 31
40namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
41{ 33{
@@ -61,7 +53,7 @@ namespace OpenSim.Data.SQLite.Tests
61 public void Cleanup() 53 public void Cleanup()
62 { 54 {
63 db.Dispose(); 55 db.Dispose();
64 System.IO.File.Delete(file); 56 File.Delete(file);
65 } 57 }
66 } 58 }
67} 59}
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index 86a1192..652a53a 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -25,16 +25,9 @@
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;
29using System.IO; 28using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
58 public void Cleanup() 51 public void Cleanup()
59 { 52 {
60 db.Dispose(); 53 db.Dispose();
61 System.IO.File.Delete(file); 54 File.Delete(file);
62 } 55 }
63 } 56 }
64} \ No newline at end of file 57} \ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
index 0415219..6f8d89d 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -25,16 +25,9 @@
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;
29using System.IO; 28using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
58 public void Cleanup() 51 public void Cleanup()
59 { 52 {
60 db.Dispose(); 53 db.Dispose();
61 System.IO.File.Delete(file); 54 File.Delete(file);
62 } 55 }
63 } 56 }
64} \ No newline at end of file 57} \ No newline at end of file
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 10cd35f..4d2bbc7 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -26,13 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using log4net.Config;
30using NUnit.Framework; 30using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
32using OpenSim.Data;
33using OpenSim.Framework;
34using OpenSim.Region.Framework.Scenes;
35using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework;
36 34
37namespace OpenSim.Data.Tests 35namespace OpenSim.Data.Tests
38{ 36{
@@ -48,7 +46,7 @@ namespace OpenSim.Data.Tests
48 { 46 {
49 try 47 try
50 { 48 {
51 log4net.Config.XmlConfigurator.Configure(); 49 XmlConfigurator.Configure();
52 } 50 }
53 catch (Exception) 51 catch (Exception)
54 { 52 {
diff --git a/OpenSim/Data/Tests/BasicEstateTest.cs b/OpenSim/Data/Tests/BasicEstateTest.cs
index 325014b..24c25ec 100644
--- a/OpenSim/Data/Tests/BasicEstateTest.cs
+++ b/OpenSim/Data/Tests/BasicEstateTest.cs
@@ -26,14 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using log4net.Config;
30using System.Drawing;
31using System.Text;
32using NUnit.Framework; 30using NUnit.Framework;
33using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
34using OpenSim.Framework;
35using OpenSim.Data;
36using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework;
37using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
38 35
39namespace OpenSim.Data.Tests 36namespace OpenSim.Data.Tests
@@ -49,7 +46,7 @@ namespace OpenSim.Data.Tests
49 { 46 {
50 try 47 try
51 { 48 {
52 log4net.Config.XmlConfigurator.Configure(); 49 XmlConfigurator.Configure();
53 } 50 }
54 catch (Exception) 51 catch (Exception)
55 { 52 {
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs
index adf3879..e3256ff 100644
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ b/OpenSim/Data/Tests/BasicGridTest.cs
@@ -28,11 +28,9 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using log4net.Config;
31using NUnit.Framework; 32using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers; 33using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Data;
34using OpenSim.Framework;
35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse; 34using OpenMetaverse;
37 35
38namespace OpenSim.Data.Tests 36namespace OpenSim.Data.Tests
@@ -49,7 +47,7 @@ namespace OpenSim.Data.Tests
49 { 47 {
50 try 48 try
51 { 49 {
52 log4net.Config.XmlConfigurator.Configure(); 50 XmlConfigurator.Configure();
53 } 51 }
54 catch (Exception) 52 catch (Exception)
55 { 53 {
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs
index 1e13ec4..1b8a5de 100644
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -26,13 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using log4net.Config;
30using NUnit.Framework; 30using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
32using OpenSim.Framework;
33using OpenSim.Data;
34using OpenSim.Region.Framework.Scenes;
35using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework;
36 34
37namespace OpenSim.Data.Tests 35namespace OpenSim.Data.Tests
38{ 36{
@@ -67,7 +65,7 @@ namespace OpenSim.Data.Tests
67 { 65 {
68 try 66 try
69 { 67 {
70 log4net.Config.XmlConfigurator.Configure(); 68 XmlConfigurator.Configure();
71 } 69 }
72 catch (Exception) 70 catch (Exception)
73 { 71 {
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index d60dadd..8e58443 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -29,14 +29,13 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.Text; 31using System.Text;
32using log4net.Config;
32using NUnit.Framework; 33using NUnit.Framework;
33using NUnit.Framework.SyntaxHelpers; 34using NUnit.Framework.SyntaxHelpers;
35using OpenMetaverse;
34using OpenSim.Framework; 36using OpenSim.Framework;
35using OpenSim.Data;
36using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.CoreModules.World.Land;
39using OpenMetaverse;
40 39
41namespace OpenSim.Data.Tests 40namespace OpenSim.Data.Tests
42{ 41{
@@ -71,7 +70,7 @@ namespace OpenSim.Data.Tests
71 { 70 {
72 try 71 try
73 { 72 {
74 log4net.Config.XmlConfigurator.Configure(); 73 XmlConfigurator.Configure();
75 } 74 }
76 catch (Exception) 75 catch (Exception)
77 { 76 {
@@ -140,7 +139,7 @@ namespace OpenSim.Data.Tests
140 } 139 }
141 catch (Exception e) 140 catch (Exception e)
142 { 141 {
143 System.Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e); 142 Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e);
144 Assert.Fail(); 143 Assert.Fail();
145 } 144 }
146 145
@@ -150,7 +149,7 @@ namespace OpenSim.Data.Tests
150 } 149 }
151 catch (Exception e) 150 catch (Exception e)
152 { 151 {
153 System.Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e); 152 Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e);
154 Assert.Fail(); 153 Assert.Fail();
155 } 154 }
156 155
@@ -651,7 +650,7 @@ namespace OpenSim.Data.Tests
651 } 650 }
652 651
653 [Test] 652 [Test]
654 [ExpectedException(typeof(System.ArgumentException))] 653 [ExpectedException(typeof(ArgumentException))]
655 public void T026_PrimInventoryMany() 654 public void T026_PrimInventoryMany()
656 { 655 {
657 UUID i1,i2,i3,i4; 656 UUID i1,i2,i3,i4;
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index 5464ade..f0a90a9 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -30,12 +30,11 @@
30using System; 30using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Text; 32using System.Text;
33using log4net.Config;
33using NUnit.Framework; 34using NUnit.Framework;
34using NUnit.Framework.SyntaxHelpers; 35using NUnit.Framework.SyntaxHelpers;
35using OpenSim.Data;
36using OpenSim.Framework;
37using OpenSim.Region.Framework.Scenes;
38using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework;
39 38
40namespace OpenSim.Data.Tests 39namespace OpenSim.Data.Tests
41{ 40{
@@ -71,7 +70,7 @@ namespace OpenSim.Data.Tests
71 { 70 {
72 try 71 try
73 { 72 {
74 log4net.Config.XmlConfigurator.Configure(); 73 XmlConfigurator.Configure();
75 } 74 }
76 catch (Exception) 75 catch (Exception)
77 { 76 {
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index eaad7ae..0fa9e58 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -25,10 +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 System.Reflection;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using OpenMetaverse; 29using OpenMetaverse;
31using log4net;
32using OpenSim.Framework; 30using OpenSim.Framework;
33 31
34namespace OpenSim.Data 32namespace OpenSim.Data
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 9d40af9..1c37601 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -28,10 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OSD = OpenMetaverse.StructuredData.OSD; 31using OpenMetaverse.StructuredData;
32using OSDMap = OpenMetaverse.StructuredData.OSDMap;
33using OSDArray = OpenMetaverse.StructuredData.OSDArray;
34using OSDParser = OpenMetaverse.StructuredData.OSDParser;
35 32
36namespace OpenSim.Framework 33namespace OpenSim.Framework
37{ 34{
@@ -108,13 +105,13 @@ namespace OpenSim.Framework
108 if (args["caps_path"] != null) 105 if (args["caps_path"] != null)
109 CapsPath = args["caps_path"].AsString(); 106 CapsPath = args["caps_path"].AsString();
110 107
111 if ((args["children_seeds"] != null) && (args["children_seeds"].Type == OpenMetaverse.StructuredData.OSDType.Array)) 108 if ((args["children_seeds"] != null) && (args["children_seeds"].Type == OSDType.Array))
112 { 109 {
113 OSDArray childrenSeeds = (OSDArray)(args["children_seeds"]); 110 OSDArray childrenSeeds = (OSDArray)(args["children_seeds"]);
114 ChildrenCapSeeds = new Dictionary<ulong, string>(); 111 ChildrenCapSeeds = new Dictionary<ulong, string>();
115 foreach (OSD o in childrenSeeds) 112 foreach (OSD o in childrenSeeds)
116 { 113 {
117 if (o.Type == OpenMetaverse.StructuredData.OSDType.Map) 114 if (o.Type == OSDType.Map)
118 { 115 {
119 ulong handle = 0; 116 ulong handle = 0;
120 string seed = ""; 117 string seed = "";
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 88ac4a6..dfe559e 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using OpenMetaverse; 29using OpenMetaverse;
31using OpenMetaverse.StructuredData;
32 30
33namespace OpenSim.Framework 31namespace OpenSim.Framework
34{ 32{
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index cc0217f..233c3d0 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
31{ 32{
@@ -62,7 +63,7 @@ namespace OpenSim.Framework
62 63
63 configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 64 configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
64 "Location of 'AssetSets.xml'", 65 "Location of 'AssetSets.xml'",
65 string.Format(".{0}assets{0}AssetSets.xml", System.IO.Path.DirectorySeparatorChar), false); 66 string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar), false);
66 } 67 }
67 68
68 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 69 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 55b4ebd..01cbfce 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Xml;
33using OpenMetaverse;
34using log4net; 33using log4net;
35using Nini.Config; 34using Nini.Config;
35using OpenMetaverse;
36 36
37/// <summary> 37/// <summary>
38/// Loads assets from the filesystem location. Not yet a plugin, though it should be. 38/// Loads assets from the filesystem location. Not yet a plugin, though it should be.
diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs
index 6c37c66..3dab9b6 100644
--- a/OpenSim/Framework/Cache.cs
+++ b/OpenSim/Framework/Cache.cs
@@ -383,7 +383,7 @@ namespace OpenSim.Framework
383 383
384 // Find an object in cache by delegate. 384 // Find an object in cache by delegate.
385 // 385 //
386 public Object Find(Predicate<OpenSim.Framework.CacheItemBase> d) 386 public Object Find(Predicate<CacheItemBase> d)
387 { 387 {
388 CacheItemBase item = m_Index.Find(d); 388 CacheItemBase item = m_Index.Find(d);
389 389
@@ -460,7 +460,7 @@ namespace OpenSim.Framework
460 460
461 if (m_DefaultTTL.Ticks != 0) 461 if (m_DefaultTTL.Ticks != 0)
462 { 462 {
463 DateTime now= System.DateTime.Now; 463 DateTime now= DateTime.Now;
464 464
465 foreach (CacheItemBase item in new List<CacheItemBase>(m_Index)) 465 foreach (CacheItemBase item in new List<CacheItemBase>(m_Index))
466 { 466 {
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 34f2866..0e72e47 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -26,14 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenMetaverse;
30using System.Collections; 29using System.Collections;
31using System.Collections.Generic; 30using System.Collections.Generic;
32 31using OpenMetaverse;
33using OSD = OpenMetaverse.StructuredData.OSD; 32using OpenMetaverse.StructuredData;
34using OSDMap = OpenMetaverse.StructuredData.OSDMap;
35using OSDArray = OpenMetaverse.StructuredData.OSDArray;
36using OSDParser = OpenMetaverse.StructuredData.OSDParser;
37 33
38namespace OpenSim.Framework 34namespace OpenSim.Framework
39{ 35{
@@ -486,7 +482,7 @@ namespace OpenSim.Framework
486 if (args["agent_access"] != null) 482 if (args["agent_access"] != null)
487 Byte.TryParse(args["agent_access"].AsString(), out AgentAccess); 483 Byte.TryParse(args["agent_access"].AsString(), out AgentAccess);
488 484
489 if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OpenMetaverse.StructuredData.OSDType.Array) 485 if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
490 { 486 {
491 OSDArray textures = (OSDArray)(args["agent_textures"]); 487 OSDArray textures = (OSDArray)(args["agent_textures"]);
492 AgentTextures = new UUID[textures.Count]; 488 AgentTextures = new UUID[textures.Count];
@@ -498,28 +494,28 @@ namespace OpenSim.Framework
498 if (args["active_group_id"] != null) 494 if (args["active_group_id"] != null)
499 ActiveGroupID = args["active_group_id"].AsUUID(); 495 ActiveGroupID = args["active_group_id"].AsUUID();
500 496
501 if ((args["groups"] != null) && (args["groups"]).Type == OpenMetaverse.StructuredData.OSDType.Array) 497 if ((args["groups"] != null) && (args["groups"]).Type == OSDType.Array)
502 { 498 {
503 OSDArray groups = (OSDArray)(args["groups"]); 499 OSDArray groups = (OSDArray)(args["groups"]);
504 Groups = new AgentGroupData[groups.Count]; 500 Groups = new AgentGroupData[groups.Count];
505 int i = 0; 501 int i = 0;
506 foreach (OSD o in groups) 502 foreach (OSD o in groups)
507 { 503 {
508 if (o.Type == OpenMetaverse.StructuredData.OSDType.Map) 504 if (o.Type == OSDType.Map)
509 { 505 {
510 Groups[i++] = new AgentGroupData((OSDMap)o); 506 Groups[i++] = new AgentGroupData((OSDMap)o);
511 } 507 }
512 } 508 }
513 } 509 }
514 510
515 if ((args["animations"] != null) && (args["animations"]).Type == OpenMetaverse.StructuredData.OSDType.Array) 511 if ((args["animations"] != null) && (args["animations"]).Type == OSDType.Array)
516 { 512 {
517 OSDArray anims = (OSDArray)(args["animations"]); 513 OSDArray anims = (OSDArray)(args["animations"]);
518 Anims = new AgentAnimationData[anims.Count]; 514 Anims = new AgentAnimationData[anims.Count];
519 int i = 0; 515 int i = 0;
520 foreach (OSD o in anims) 516 foreach (OSD o in anims)
521 { 517 {
522 if (o.Type == OpenMetaverse.StructuredData.OSDType.Map) 518 if (o.Type == OSDType.Map)
523 { 519 {
524 Anims[i++] = new AgentAnimationData((OSDMap)o); 520 Anims[i++] = new AgentAnimationData((OSDMap)o);
525 } 521 }
diff --git a/OpenSim/Framework/Client/IClientChat.cs b/OpenSim/Framework/Client/IClientChat.cs
index c89bf53..078ea9b 100644
--- a/OpenSim/Framework/Client/IClientChat.cs
+++ b/OpenSim/Framework/Client/IClientChat.cs
@@ -25,9 +25,6 @@
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;
29using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Framework.Client 30namespace OpenSim.Framework.Client
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 2296e46..1c8f9d6 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -29,11 +29,11 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading; 31using System.Threading;
32using GlynnTucker.Cache;
33using log4net;
32using OpenMetaverse; 34using OpenMetaverse;
33using OpenMetaverse.Packets; 35using OpenMetaverse.Packets;
34using log4net;
35using OpenSim.Framework.Statistics; 36using OpenSim.Framework.Statistics;
36using GlynnTucker.Cache;
37 37
38namespace OpenSim.Framework.Communications.Cache 38namespace OpenSim.Framework.Communications.Cache
39{ 39{
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index cc5ba8e..5c902ec 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -28,11 +28,11 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Threading; 30using System.Threading;
31using OpenMetaverse;
32using log4net; 31using log4net;
32using OpenMetaverse;
33using OpenSim.Data;
33using OpenSim.Framework.AssetLoader.Filesystem; 34using OpenSim.Framework.AssetLoader.Filesystem;
34using OpenSim.Framework.Statistics; 35using OpenSim.Framework.Statistics;
35using OpenSim.Data;
36 36
37namespace OpenSim.Framework.Communications.Cache 37namespace OpenSim.Framework.Communications.Cache
38{ 38{
diff --git a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs b/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
index be10e96..d56e48a 100644
--- a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
@@ -27,7 +27,6 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31 30
32namespace OpenSim.Framework.Communications.Cache 31namespace OpenSim.Framework.Communications.Cache
33{ 32{
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 99a982b..15066cd 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -28,10 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading;
32
33using OpenMetaverse;
34using log4net; 31using log4net;
32using OpenMetaverse;
35 33
36namespace OpenSim.Framework.Communications.Cache 34namespace OpenSim.Framework.Communications.Cache
37{ 35{
diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
index 038c591..55db289 100644
--- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://www.openmetaverse.org/ 2 * Copyright (c) Contributors, http://www.openmetaverse.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -34,11 +34,11 @@ using System;
34using System.Collections.Generic; 34using System.Collections.Generic;
35using System.IO; 35using System.IO;
36using System.Reflection; 36using System.Reflection;
37using System.Security.Cryptography;
37using System.Text; 38using System.Text;
38using System.Xml.Serialization; 39using System.Xml.Serialization;
39using log4net; 40using log4net;
40using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
41using System.Security.Cryptography;
42 42
43namespace OpenSim.Framework.Communications.Cache 43namespace OpenSim.Framework.Communications.Cache
44{ 44{
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index 4c629f4..58c3269 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31
31//using System.Reflection; 32//using System.Reflection;
32 33
33//using log4net; 34//using log4net;
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 0b05adf..93f126f 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Xml;
33using OpenMetaverse;
34using log4net; 33using log4net;
35using Nini.Config; 34using Nini.Config;
35using OpenMetaverse;
36 36
37namespace OpenSim.Framework.Communications.Cache 37namespace OpenSim.Framework.Communications.Cache
38{ 38{
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 22aab10..ef190c8 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -25,12 +25,10 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Reflection; 29using System.Reflection;
31using System.Threading;
32using OpenMetaverse;
33using log4net; 30using log4net;
31using OpenMetaverse;
34 32
35namespace OpenSim.Framework.Communications.Cache 33namespace OpenSim.Framework.Communications.Cache
36{ 34{
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index cfe9002..b68083e 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -30,11 +30,10 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using OpenMetaverse;
34using log4net; 33using log4net;
35using OpenSim.Framework.Communications.Cache; 34using OpenMetaverse;
36using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
37using OpenSim.Framework; 36
38// using OpenSim.Region.Framework.Interfaces; 37// using OpenSim.Region.Framework.Interfaces;
39 38
40namespace OpenSim.Framework.Communications.Capabilities 39namespace OpenSim.Framework.Communications.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs b/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
index 829b4e5..874a27f 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
@@ -25,7 +25,6 @@
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;
29using OpenMetaverse; 28using OpenMetaverse;
30 29
31namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index c68a205..906f5d5 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -27,7 +27,6 @@
27 27
28using System.Collections; 28using System.Collections;
29using System.IO; 29using System.IO;
30using System.Net;
31using System.Text; 30using System.Text;
32using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
33 32
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 2107f63..936e583 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -25,11 +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 System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Reflection;
31using OpenMetaverse; 29using OpenMetaverse;
32using log4net;
33using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
35 32
diff --git a/OpenSim/Framework/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs
index bd108c1..488ce8e 100644
--- a/OpenSim/Framework/Communications/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/GridInfoService.cs
@@ -34,7 +34,6 @@ using log4net;
34using Nini.Config; 34using Nini.Config;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Framework;
38 37
39namespace OpenSim.Framework.Communications 38namespace OpenSim.Framework.Communications
40{ 39{
diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs
index 25b26dd..3822e9f 100644
--- a/OpenSim/Framework/Communications/IAvatarService.cs
+++ b/OpenSim/Framework/Communications/IAvatarService.cs
@@ -25,9 +25,6 @@
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;
29using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Framework.Communications 30namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/IHyperlink.cs b/OpenSim/Framework/Communications/IHyperlink.cs
index fa088d6..6c61d82 100644
--- a/OpenSim/Framework/Communications/IHyperlink.cs
+++ b/OpenSim/Framework/Communications/IHyperlink.cs
@@ -25,11 +25,6 @@
25 * OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THE POSSIBILITY OF SUCH DAMAGE.
26 * 26 *
27 */ 27 */
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using OpenSim.Framework;
33 28
34namespace OpenSim.Framework.Communications 29namespace OpenSim.Framework.Communications
35{ 30{
diff --git a/OpenSim/Framework/Communications/ISecureInventoryService.cs b/OpenSim/Framework/Communications/ISecureInventoryService.cs
index 6d4ce46..6da13fe 100644
--- a/OpenSim/Framework/Communications/ISecureInventoryService.cs
+++ b/OpenSim/Framework/Communications/ISecureInventoryService.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,9 +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 System.Collections.Generic;
29using OpenMetaverse; 28using OpenMetaverse;
30using OpenSim.Framework.Communications.Cache;
31 29
32namespace OpenSim.Framework.Communications 30namespace OpenSim.Framework.Communications
33{ 31{
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 8753c64..de76415 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -25,14 +25,10 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Reflection; 29using System.Reflection;
31using System.Threading;
32
33using OpenMetaverse;
34using log4net; 30using log4net;
35 31using OpenMetaverse;
36using OpenSim.Data; 32using OpenSim.Data;
37 33
38namespace OpenSim.Framework.Communications 34namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 867e9e6..d1b9258 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -29,10 +29,10 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using OpenMetaverse.StructuredData;
34using log4net; 32using log4net;
35using Nwc.XmlRpc; 33using Nwc.XmlRpc;
34using OpenMetaverse;
35using OpenMetaverse.StructuredData;
36 36
37namespace OpenSim.Framework.Communications 37namespace OpenSim.Framework.Communications
38{ 38{
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index fe904b5..ae16715 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -33,10 +33,10 @@ using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using System.Threading; 34using System.Threading;
35using System.Web; 35using System.Web;
36using OpenMetaverse;
37using OpenMetaverse.StructuredData;
38using log4net; 36using log4net;
39using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenMetaverse;
39using OpenMetaverse.StructuredData;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
42 42
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index 970f2a9..69932fc 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -291,7 +291,7 @@ namespace OpenSim.Framework.Communications
291 { 291 {
292 _response = (HttpWebResponse) _request.GetResponse(); 292 _response = (HttpWebResponse) _request.GetResponse();
293 } 293 }
294 catch (System.Net.WebException e) 294 catch (WebException e)
295 { 295 {
296 m_log.ErrorFormat("[ASSET] Error fetching asset from asset server"); 296 m_log.ErrorFormat("[ASSET] Error fetching asset from asset server");
297 m_log.Debug(e.ToString()); 297 m_log.Debug(e.ToString());
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 86d85b1..cda9d5c 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -25,16 +25,13 @@
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;
29using log4net;
30using NUnit.Framework; 28using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 29using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 30using OpenMetaverse;
33//using OpenSim.Framework; 31using OpenSim.Data;
34using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Communications.Local;
36using OpenSim.Tests.Common.Mock; 33using OpenSim.Tests.Common.Mock;
37using OpenSim.Data; 34//using OpenSim.Framework;
38 35
39namespace OpenSim.Framework.Communications.Tests 36namespace OpenSim.Framework.Communications.Tests
40{ 37{
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
index cf07ae5..85cc940 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
@@ -26,10 +26,8 @@
26 */ 26 */
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework.Communications;
30using OpenSim.Framework.Communications.Cache; 29using OpenSim.Framework.Communications.Cache;
31using OpenSim.Region.Communications.Local; 30using OpenSim.Region.Communications.Local;
32using OpenSim.Tests.Common.Mock;
33 31
34namespace OpenSim.Framework.Communications.Tests 32namespace OpenSim.Framework.Communications.Tests
35{ 33{
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index ffa3c5f..57ed0f5 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -29,8 +29,6 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Net; 30using System.Net;
31using System.Text.RegularExpressions; 31using System.Text.RegularExpressions;
32using System.Xml;
33using Nini;
34using NUnit.Framework; 32using NUnit.Framework;
35using NUnit.Framework.SyntaxHelpers; 33using NUnit.Framework.SyntaxHelpers;
36using Nwc.XmlRpc; 34using Nwc.XmlRpc;
@@ -61,7 +59,7 @@ namespace OpenSim.Framework.Communications.Tests
61 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123); 59 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123);
62 60
63 CommunicationsManager commsManager 61 CommunicationsManager commsManager
64 = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43)); 62 = new TestCommunicationsManager(new NetworkServersInfo(42, 43));
65 63
66 commsManager.GridService.RegisterRegion( 64 commsManager.GridService.RegisterRegion(
67 new RegionInfo(42, 43, capsEndPoint, regionExternalName)); 65 new RegionInfo(42, 43, capsEndPoint, regionExternalName));
@@ -89,7 +87,7 @@ namespace OpenSim.Framework.Communications.Tests
89 Assert.That(responseData["first_name"], Is.EqualTo(firstName)); 87 Assert.That(responseData["first_name"], Is.EqualTo(firstName));
90 Assert.That(responseData["last_name"], Is.EqualTo(lastName)); 88 Assert.That(responseData["last_name"], Is.EqualTo(lastName));
91 Assert.That( 89 Assert.That(
92 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue)); 90 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue));
93 91
94 Regex capsSeedPattern 92 Regex capsSeedPattern
95 = new Regex("^http://" 93 = new Regex("^http://"
@@ -108,7 +106,7 @@ namespace OpenSim.Framework.Communications.Tests
108 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123); 106 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123);
109 107
110 CommunicationsManager commsManager 108 CommunicationsManager commsManager
111 = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43)); 109 = new TestCommunicationsManager(new NetworkServersInfo(42, 43));
112 110
113 commsManager.GridService.RegisterRegion( 111 commsManager.GridService.RegisterRegion(
114 new RegionInfo(42, 43, capsEndPoint, regionExternalName)); 112 new RegionInfo(42, 43, capsEndPoint, regionExternalName));
@@ -159,7 +157,7 @@ namespace OpenSim.Framework.Communications.Tests
159 Hashtable invlibroothash = (Hashtable) invlibroot[0]; 157 Hashtable invlibroothash = (Hashtable) invlibroot[0];
160 Assert.That(invlibroothash["folder_id"],Is.EqualTo("00000112-000f-0000-0000-000100bba000")); 158 Assert.That(invlibroothash["folder_id"],Is.EqualTo("00000112-000f-0000-0000-000100bba000"));
161 Assert.That( 159 Assert.That(
162 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue)); 160 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue));
163 Assert.That(responseData["message"], Is.EqualTo("Hello folks")); 161 Assert.That(responseData["message"], Is.EqualTo("Hello folks"));
164 Assert.That(responseData["buddy-list"], Is.Empty); 162 Assert.That(responseData["buddy-list"], Is.Empty);
165 Assert.That(responseData["start_location"], Is.EqualTo("last")); 163 Assert.That(responseData["start_location"], Is.EqualTo("last"));
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 0af9652..62c3f89 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -26,17 +26,16 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Net; 30using System.Net;
32using System.Reflection; 31using System.Reflection;
33using System.Security.Cryptography; 32using System.Security.Cryptography;
34using OpenMetaverse;
35using OpenMetaverse.StructuredData;
36using log4net; 33using log4net;
37using Nwc.XmlRpc; 34using Nwc.XmlRpc;
38using OpenSim.Framework.Statistics; 35using OpenMetaverse;
36using OpenMetaverse.StructuredData;
39using OpenSim.Data; 37using OpenSim.Data;
38using OpenSim.Framework.Statistics;
40 39
41namespace OpenSim.Framework.Communications 40namespace OpenSim.Framework.Communications
42{ 41{
diff --git a/OpenSim/Framework/Communications/XMPP/XmppError.cs b/OpenSim/Framework/Communications/XMPP/XmppError.cs
index 1698b6a..8b7e502 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppError.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppError.cs
@@ -25,8 +25,6 @@
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;
29using System.Xml;
30using System.Xml.Serialization; 28using System.Xml.Serialization;
31 29
32namespace OpenSim.Framework.Communications.XMPP 30namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
index 1789536..26a98ec 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
@@ -25,8 +25,6 @@
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;
29using System.Xml;
30using System.Xml.Serialization; 28using System.Xml.Serialization;
31 29
32namespace OpenSim.Framework.Communications.XMPP 30namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
index fd4cd5f..d150708 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
@@ -25,8 +25,6 @@
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;
29using System.Xml;
30using System.Xml.Serialization; 28using System.Xml.Serialization;
31 29
32namespace OpenSim.Framework.Communications.XMPP 30namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
index d63a0d1..95d2ca3 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
@@ -25,8 +25,6 @@
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;
29using System.Xml;
30using System.Xml.Serialization; 28using System.Xml.Serialization;
31 29
32namespace OpenSim.Framework.Communications.XMPP 30namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
index eb9dabe..888686b 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
@@ -27,12 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
31using System.Reflection;
32using System.Text;
33using System.Xml; 30using System.Xml;
34using System.Xml.Serialization; 31using System.Xml.Serialization;
35using log4net;
36 32
37namespace OpenSim.Framework.Communications.XMPP 33namespace OpenSim.Framework.Communications.XMPP
38{ 34{
diff --git a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
index 00df14a..db3c5eb 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Xml;
30using System.Xml.Serialization; 29using System.Xml.Serialization;
31 30
32namespace OpenSim.Framework.Communications.XMPP 31namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
index c5ad9b4..4937f7a 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
@@ -28,7 +28,6 @@
28using System.IO; 28using System.IO;
29using System.Text; 29using System.Text;
30using System.Xml; 30using System.Xml;
31
32using IOStream = System.IO.Stream; 31using IOStream = System.IO.Stream;
33 32
34namespace OpenSim.Framework.Communications.XMPP 33namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index b54aafb..1868168 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -288,7 +288,7 @@ namespace OpenSim.Framework
288 // if the first character is a "$", assume it's the name 288 // if the first character is a "$", assume it's the name
289 // of an environment variable and substitute with the value of that variable 289 // of an environment variable and substitute with the value of that variable
290 if (console_result.StartsWith("$")) 290 if (console_result.StartsWith("$"))
291 console_result = System.Environment.GetEnvironmentVariable(console_result.Substring(1)); 291 console_result = Environment.GetEnvironmentVariable(console_result.Substring(1));
292 292
293 switch (configOption.configurationType) 293 switch (configOption.configurationType)
294 { 294 {
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 721e91a..793270b 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -26,10 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Text;
30using System.Reflection;
31using System.Diagnostics;
32using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics;
31using System.Reflection;
32using System.Text;
33using System.Threading;
33using log4net; 34using log4net;
34 35
35namespace OpenSim.Framework.Console 36namespace OpenSim.Framework.Console
@@ -77,8 +78,8 @@ namespace OpenSim.Framework.Console
77 /// <value> 78 /// <value>
78 /// Commands organized by keyword in a tree 79 /// Commands organized by keyword in a tree
79 /// </value> 80 /// </value>
80 private Dictionary<string, Object> tree = 81 private Dictionary<string, object> tree =
81 new Dictionary<string, Object>(); 82 new Dictionary<string, object>();
82 83
83 /// <summary> 84 /// <summary>
84 /// Get help for the given help string 85 /// Get help for the given help string
@@ -149,7 +150,7 @@ namespace OpenSim.Framework.Console
149 return help; 150 return help;
150 } 151 }
151 152
152 private List<string> CollectHelp(Dictionary<string, Object> dict) 153 private List<string> CollectHelp(Dictionary<string, object> dict)
153 { 154 {
154 List<string> result = new List<string>(); 155 List<string> result = new List<string>();
155 156
@@ -708,7 +709,7 @@ namespace OpenSim.Framework.Console
708 709
709 public void LockOutput() 710 public void LockOutput()
710 { 711 {
711 System.Threading.Monitor.Enter(cmdline); 712 Monitor.Enter(cmdline);
712 try 713 try
713 { 714 {
714 if (y != -1) 715 if (y != -1)
@@ -738,7 +739,7 @@ namespace OpenSim.Framework.Console
738 y = System.Console.CursorTop; 739 y = System.Console.CursorTop;
739 Show(); 740 Show();
740 } 741 }
741 System.Threading.Monitor.Exit(cmdline); 742 Monitor.Exit(cmdline);
742 } 743 }
743 744
744 public void Output(string text) 745 public void Output(string text)
diff --git a/OpenSim/Framework/ForeignUserProfileData.cs b/OpenSim/Framework/ForeignUserProfileData.cs
index 4f734a7..f971eb0 100644
--- a/OpenSim/Framework/ForeignUserProfileData.cs
+++ b/OpenSim/Framework/ForeignUserProfileData.cs
@@ -28,8 +28,6 @@
28 28
29using System; 29using System;
30 30
31using OpenSim.Framework;
32
33namespace OpenSim.Framework 31namespace OpenSim.Framework
34{ 32{
35 public class ForeignUserProfileData : UserProfileData 33 public class ForeignUserProfileData : UserProfileData
diff --git a/OpenSim/Framework/HGNetworkServersInfo.cs b/OpenSim/Framework/HGNetworkServersInfo.cs
index 227200e..803c712 100644
--- a/OpenSim/Framework/HGNetworkServersInfo.cs
+++ b/OpenSim/Framework/HGNetworkServersInfo.cs
@@ -26,12 +26,8 @@
26 * 26 *
27 */ 27 */
28 28
29using System;
30using System.Collections.Generic;
31using System.Net; 29using System.Net;
32 30
33using OpenSim.Framework;
34
35namespace OpenSim.Framework 31namespace OpenSim.Framework
36{ 32{
37 public class HGNetworkServersInfo 33 public class HGNetworkServersInfo
diff --git a/OpenSim/Framework/IClientFileTransfer.cs b/OpenSim/Framework/IClientFileTransfer.cs
index ac5fc2b..f947b17 100644
--- a/OpenSim/Framework/IClientFileTransfer.cs
+++ b/OpenSim/Framework/IClientFileTransfer.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,9 +25,6 @@
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;
29using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 7904e94..ae31e3c 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -25,8 +25,6 @@
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;
29using OpenSim.Framework;
30using OpenMetaverse; 28using OpenMetaverse;
31 29
32namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/IPlugin.cs b/OpenSim/Framework/IPlugin.cs
index 1eb1c06..01ea475 100644
--- a/OpenSim/Framework/IPlugin.cs
+++ b/OpenSim/Framework/IPlugin.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework
42 /// <summary> 42 /// <summary>
43 /// This interface, describes a generic plugin 43 /// This interface, describes a generic plugin
44 /// </summary> 44 /// </summary>
45 public interface IPlugin : System.IDisposable 45 public interface IPlugin : IDisposable
46 { 46 {
47 /// <summary> 47 /// <summary>
48 /// Returns the plugin version 48 /// Returns the plugin version
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 1c0a3b5..c400309 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -25,7 +25,6 @@
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.Collections.Generic;
29using OpenMetaverse; 28using OpenMetaverse;
30using OpenSim.Framework.Console; 29using OpenSim.Framework.Console;
31 30
diff --git a/OpenSim/Framework/InventoryNodeBase.cs b/OpenSim/Framework/InventoryNodeBase.cs
index 6f61ab5..6c9b86d 100644
--- a/OpenSim/Framework/InventoryNodeBase.cs
+++ b/OpenSim/Framework/InventoryNodeBase.cs
@@ -25,8 +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 OpenMetaverse; 28using OpenMetaverse;
29 29
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
32 /// <summary> 32 /// <summary>
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 2ff59cd..f361cc3 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Framework
125 } 125 }
126 } 126 }
127 127
128 public OpenMetaverse.Parcel.ParcelCategory Category { 128 public Parcel.ParcelCategory Category {
129 get { 129 get {
130 return _category; 130 return _category;
131 } 131 }
@@ -233,7 +233,7 @@ namespace OpenSim.Framework
233 } 233 }
234 } 234 }
235 235
236 public OpenMetaverse.Parcel.ParcelStatus Status { 236 public Parcel.ParcelStatus Status {
237 get { 237 get {
238 return _status; 238 return _status;
239 } 239 }
@@ -314,7 +314,7 @@ namespace OpenSim.Framework
314 } 314 }
315 } 315 }
316 316
317 public List<OpenMetaverse.ParcelManager.ParcelAccessEntry> ParcelAccessList { 317 public List<ParcelManager.ParcelAccessEntry> ParcelAccessList {
318 get { 318 get {
319 return _parcelAccessList; 319 return _parcelAccessList;
320 } 320 }
diff --git a/OpenSim/Framework/Servers/BaseHTTPHandler.cs b/OpenSim/Framework/Servers/BaseHTTPHandler.cs
index a7c3562..2aa37fb 100644
--- a/OpenSim/Framework/Servers/BaseHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/BaseHTTPHandler.cs
@@ -25,7 +25,6 @@
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;
29using System.Collections; 28using System.Collections;
30 29
31namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index d69b2c0..620a7f6 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -35,12 +35,12 @@ using System.Reflection;
35using System.Text; 35using System.Text;
36using System.Threading; 36using System.Threading;
37using System.Xml; 37using System.Xml;
38using OpenMetaverse.StructuredData; 38using HttpServer;
39using log4net; 39using log4net;
40using Nwc.XmlRpc; 40using Nwc.XmlRpc;
41using OpenMetaverse.StructuredData;
41using CoolHTTPListener = HttpServer.HttpListener; 42using CoolHTTPListener = HttpServer.HttpListener;
42using IHttpClientContext = HttpServer.IHttpClientContext; 43using HttpListener=System.Net.HttpListener;
43using IHttpRequest = HttpServer.IHttpRequest;
44 44
45namespace OpenSim.Framework.Servers 45namespace OpenSim.Framework.Servers
46{ 46{
@@ -219,7 +219,7 @@ namespace OpenSim.Framework.Servers
219 public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request) 219 public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request)
220 { 220 {
221 OSHttpRequest req = new OSHttpRequest(context, request); 221 OSHttpRequest req = new OSHttpRequest(context, request);
222 OSHttpResponse resp = new OSHttpResponse(new HttpServer.HttpResponse(context, request)); 222 OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request));
223 //resp.KeepAlive = req.KeepAlive; 223 //resp.KeepAlive = req.KeepAlive;
224 //m_log.Info("[Debug BASE HTTP SERVER]: Got Request"); 224 //m_log.Info("[Debug BASE HTTP SERVER]: Got Request");
225 //HttpServerContextObj objstate= new HttpServerContextObj(req,resp); 225 //HttpServerContextObj objstate= new HttpServerContextObj(req,resp);
@@ -1373,7 +1373,7 @@ namespace OpenSim.Framework.Servers
1373 { 1373 {
1374 //m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); 1374 //m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
1375 //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/"); 1375 //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/");
1376 m_httpListener2 = new HttpServer.HttpListener(IPAddress.Any, (int)m_port); 1376 m_httpListener2 = new CoolHTTPListener(IPAddress.Any, (int)m_port);
1377 m_httpListener2.ExceptionThrown += httpServerException; 1377 m_httpListener2.ExceptionThrown += httpServerException;
1378 m_httpListener2.LogWriter = httpserverlog; 1378 m_httpListener2.LogWriter = httpserverlog;
1379 1379
@@ -1408,7 +1408,7 @@ namespace OpenSim.Framework.Servers
1408 } 1408 }
1409 } 1409 }
1410 1410
1411 public void httpServerDisconnectMonitor(HttpServer.IHttpClientContext source, SocketError err) 1411 public void httpServerDisconnectMonitor(IHttpClientContext source, SocketError err)
1412 { 1412 {
1413 switch (err) 1413 switch (err)
1414 { 1414 {
@@ -1564,11 +1564,11 @@ namespace OpenSim.Framework.Servers
1564 /// Relays HttpServer log messages to our own logging mechanism. 1564 /// Relays HttpServer log messages to our own logging mechanism.
1565 /// </summary> 1565 /// </summary>
1566 /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information 1566 /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information
1567 public class HttpServerLogWriter : HttpServer.ILogWriter 1567 public class HttpServerLogWriter : ILogWriter
1568 { 1568 {
1569 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 1569 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
1570 1570
1571 public void Write(object source, HttpServer.LogPrio priority, string message) 1571 public void Write(object source, LogPrio priority, string message)
1572 { 1572 {
1573 /* 1573 /*
1574 switch (priority) 1574 switch (priority)
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index ff53e1a..4cbbecc 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -38,6 +38,7 @@ using log4net.Core;
38using log4net.Repository; 38using log4net.Repository;
39using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
40using OpenSim.Framework.Statistics; 40using OpenSim.Framework.Statistics;
41using Timer=System.Timers.Timer;
41 42
42namespace OpenSim.Framework.Servers 43namespace OpenSim.Framework.Servers
43{ 44{
@@ -52,7 +53,7 @@ namespace OpenSim.Framework.Servers
52 /// This will control a periodic log printout of the current 'show stats' (if they are active) for this 53 /// This will control a periodic log printout of the current 'show stats' (if they are active) for this
53 /// server. 54 /// server.
54 /// </summary> 55 /// </summary>
55 private System.Timers.Timer m_periodicDiagnosticsTimer = new System.Timers.Timer(60 * 60 * 1000); 56 private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
56 57
57 protected ConsoleBase m_console; 58 protected ConsoleBase m_console;
58 59
@@ -266,7 +267,7 @@ namespace OpenSim.Framework.Servers
266 267
267 // If there is no threshold set then the threshold is effectively everything. 268 // If there is no threshold set then the threshold is effectively everything.
268 Level thresholdLevel 269 Level thresholdLevel
269 = (null != consoleAppender.Threshold ? consoleAppender.Threshold : log4net.Core.Level.All); 270 = (null != consoleAppender.Threshold ? consoleAppender.Threshold : Level.All);
270 271
271 Notice(String.Format("Console log level is {0}", thresholdLevel)); 272 Notice(String.Format("Console log level is {0}", thresholdLevel));
272 } 273 }
diff --git a/OpenSim/Framework/Servers/BaseStreamHandler.cs b/OpenSim/Framework/Servers/BaseStreamHandler.cs
index 6b0614f..771def4 100644
--- a/OpenSim/Framework/Servers/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BaseStreamHandler.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.IO; 28using System.IO;
29using System.Net;
30 29
31namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
32{ 31{
diff --git a/OpenSim/Framework/Servers/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
index 26a6f10..6540798 100644
--- a/OpenSim/Framework/Servers/BinaryStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
@@ -27,7 +27,6 @@
27 27
28using System.IO; 28using System.IO;
29using System.Text; 29using System.Text;
30using System.Net;
31 30
32namespace OpenSim.Framework.Servers 31namespace OpenSim.Framework.Servers
33{ 32{
diff --git a/OpenSim/Framework/Servers/IHttpAgentHandler.cs b/OpenSim/Framework/Servers/IHttpAgentHandler.cs
index ff3a5b9..e6ad57e 100644
--- a/OpenSim/Framework/Servers/IHttpAgentHandler.cs
+++ b/OpenSim/Framework/Servers/IHttpAgentHandler.cs
@@ -25,10 +25,6 @@
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.Collections;
29using System.IO;
30using System.Net;
31
32namespace OpenSim.Framework.Servers 28namespace OpenSim.Framework.Servers
33{ 29{
34 public interface IHttpAgentHandler 30 public interface IHttpAgentHandler
diff --git a/OpenSim/Framework/Servers/IStreamHandler.cs b/OpenSim/Framework/Servers/IStreamHandler.cs
index b3ce34d..76bf4d5 100644
--- a/OpenSim/Framework/Servers/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/IStreamHandler.cs
@@ -27,7 +27,6 @@
27 27
28using System.Collections; 28using System.Collections;
29using System.IO; 29using System.IO;
30using System.Net;
31 30
32namespace OpenSim.Framework.Servers 31namespace OpenSim.Framework.Servers
33{ 32{
diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs
index 4c7d7ce..8e0cb38 100644
--- a/OpenSim/Framework/Servers/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/OSHttpRequest.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Collections.Specialized; 31using System.Collections.Specialized;
32using System.Net;
33using System.IO; 32using System.IO;
33using System.Net;
34using System.Reflection; 34using System.Reflection;
35using System.Text; 35using System.Text;
36using HttpServer; 36using HttpServer;
diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs
index 4947156..ff02edd 100644
--- a/OpenSim/Framework/Servers/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/OSHttpResponse.cs
@@ -25,8 +25,6 @@
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;
29using System.Collections;
30using System.IO; 28using System.IO;
31using System.Net; 29using System.Net;
32using System.Text; 30using System.Text;
diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
index 5c2dd4a..41d86e5 100644
--- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.IO; 28using System.IO;
29using System.Net;
30using System.Xml; 29using System.Xml;
31using System.Xml.Serialization; 30using System.Xml.Serialization;
32 31
diff --git a/OpenSim/Framework/Servers/RestHTTPHandler.cs b/OpenSim/Framework/Servers/RestHTTPHandler.cs
index 2974c56..5722885 100644
--- a/OpenSim/Framework/Servers/RestHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/RestHTTPHandler.cs
@@ -25,7 +25,6 @@
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;
29using System.Collections; 28using System.Collections;
30 29
31namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs
index 958ee26..60da05e 100644
--- a/OpenSim/Framework/Servers/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/RestSessionService.cs
@@ -28,12 +28,10 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net; 30using System.Net;
31using System.Collections.Generic;
32using System.Reflection; 31using System.Reflection;
33using System.Text; 32using System.Text;
34using System.Xml; 33using System.Xml;
35using System.Xml.Serialization; 34using System.Xml.Serialization;
36
37using log4net; 35using log4net;
38 36
39namespace OpenSim.Framework.Servers 37namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/RestStreamHandler.cs b/OpenSim/Framework/Servers/RestStreamHandler.cs
index 44c9dfc..afd7fe5 100644
--- a/OpenSim/Framework/Servers/RestStreamHandler.cs
+++ b/OpenSim/Framework/Servers/RestStreamHandler.cs
@@ -27,7 +27,6 @@
27 27
28using System.IO; 28using System.IO;
29using System.Text; 29using System.Text;
30using System.Net;
31 30
32namespace OpenSim.Framework.Servers 31namespace OpenSim.Framework.Servers
33{ 32{
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
index fe553c9..3a297bf 100644
--- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
+++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
@@ -31,23 +31,18 @@ using System.IO;
31using System.Net; 31using System.Net;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using System.Text; 33using System.Text;
34
35using HttpServer; 34using HttpServer;
36using HttpServer.Exceptions;
37using HttpServer.FormDecoders; 35using HttpServer.FormDecoders;
38
39using NUnit.Framework; 36using NUnit.Framework;
40using NUnit.Framework.SyntaxHelpers; 37using NUnit.Framework.SyntaxHelpers;
41 38
42using OpenSim.Framework.Servers;
43
44namespace OpenSim.Framework.Servers.Tests 39namespace OpenSim.Framework.Servers.Tests
45{ 40{
46 [TestFixture] 41 [TestFixture]
47 public class OSHttpTests 42 public class OSHttpTests
48 { 43 {
49 // we need an IHttpClientContext for our tests 44 // we need an IHttpClientContext for our tests
50 public class TestHttpClientContext: HttpServer.IHttpClientContext 45 public class TestHttpClientContext: IHttpClientContext
51 { 46 {
52 private bool _secured; 47 private bool _secured;
53 public bool Secured 48 public bool Secured
@@ -68,7 +63,7 @@ namespace OpenSim.Framework.Servers.Tests
68 public void Send(byte[] buffer, int offset, int size) {} 63 public void Send(byte[] buffer, int offset, int size) {}
69 } 64 }
70 65
71 public class TestHttpRequest: HttpServer.IHttpRequest 66 public class TestHttpRequest: IHttpRequest
72 { 67 {
73 public bool BodyIsComplete 68 public bool BodyIsComplete
74 { 69 {
diff --git a/OpenSim/Framework/SimStats.cs b/OpenSim/Framework/SimStats.cs
index 865dee2..8280708 100644
--- a/OpenSim/Framework/SimStats.cs
+++ b/OpenSim/Framework/SimStats.cs
@@ -25,6 +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 OpenMetaverse;
28using OpenMetaverse.Packets; 29using OpenMetaverse.Packets;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
@@ -73,15 +74,15 @@ namespace OpenSim.Framework
73 } 74 }
74 private uint m_objectCapacity; 75 private uint m_objectCapacity;
75 76
76 public OpenMetaverse.UUID RegionUUID 77 public UUID RegionUUID
77 { 78 {
78 get { return regionUUID;} 79 get { return regionUUID;}
79 } 80 }
80 private OpenMetaverse.UUID regionUUID; 81 private UUID regionUUID;
81 82
82 public SimStats( 83 public SimStats(
83 uint regionX, uint regionY, uint regionFlags, uint objectCapacity, 84 uint regionX, uint regionY, uint regionFlags, uint objectCapacity,
84 SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock, OpenMetaverse.UUID pRUUID) 85 SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock, UUID pRUUID)
85 { 86 {
86 regionUUID = pRUUID; 87 regionUUID = pRUUID;
87 m_regionX = regionX; 88 m_regionX = regionX;
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 43c73b2..ce654eb 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -29,7 +29,6 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenMetaverse.Packets;
33using OpenSim.Framework.Statistics.Interfaces; 32using OpenSim.Framework.Statistics.Interfaces;
34 33
35namespace OpenSim.Framework.Statistics 34namespace OpenSim.Framework.Statistics
diff --git a/OpenSim/Framework/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs
index 5617e2b..b45a42f 100644
--- a/OpenSim/Framework/Tests/LocationTest.cs
+++ b/OpenSim/Framework/Tests/LocationTest.cs
@@ -25,9 +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 OpenMetaverse;
29using NUnit.Framework; 28using NUnit.Framework;
30using NUnit.Framework.SyntaxHelpers;
31 29
32namespace OpenSim.Framework.Tests 30namespace OpenSim.Framework.Tests
33{ 31{
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index 0224356..c5f1800 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -25,9 +25,9 @@
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 OpenMetaverse;
29using NUnit.Framework; 28using NUnit.Framework;
30using NUnit.Framework.SyntaxHelpers; 29using NUnit.Framework.SyntaxHelpers;
30using OpenMetaverse;
31using OpenSim.Tests.Common; 31using OpenSim.Tests.Common;
32 32
33namespace OpenSim.Framework.Tests 33namespace OpenSim.Framework.Tests
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index cc048b7..901b57a 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
31{ 32{
@@ -113,7 +114,7 @@ namespace OpenSim.Framework
113 configMember.addConfigurationOption("library_location", 114 configMember.addConfigurationOption("library_location",
114 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 115 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
115 "Path to library control file", 116 "Path to library control file",
116 string.Format(".{0}inventory{0}Libraries.xml", System.IO.Path.DirectorySeparatorChar), false); 117 string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false);
117 118
118 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 119 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
119 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 120 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index df7a552..9949ad8 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -194,7 +194,7 @@ namespace OpenSim.Framework
194 } 194 }
195 195
196 public static T Clamp<T>(T x, T min, T max) 196 public static T Clamp<T>(T x, T min, T max)
197 where T : System.IComparable<T> 197 where T : IComparable<T>
198 { 198 {
199 return x.CompareTo(max) > 0 ? max : 199 return x.CompareTo(max) > 0 ? max :
200 x.CompareTo(min) < 0 ? min : 200 x.CompareTo(min) < 0 ? min :
@@ -758,8 +758,8 @@ namespace OpenSim.Framework
758 memory.Read(compressed, 0, compressed.Length); 758 memory.Read(compressed, 0, compressed.Length);
759 759
760 byte[] compressedBuffer = new byte[compressed.Length + 4]; 760 byte[] compressedBuffer = new byte[compressed.Length + 4];
761 System.Buffer.BlockCopy(compressed, 0, compressedBuffer, 4, compressed.Length); 761 Buffer.BlockCopy(compressed, 0, compressedBuffer, 4, compressed.Length);
762 System.Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, compressedBuffer, 0, 4); 762 Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, compressedBuffer, 0, 4);
763 return Convert.ToBase64String(compressedBuffer); 763 return Convert.ToBase64String(compressedBuffer);
764 } 764 }
765 765
@@ -872,9 +872,9 @@ namespace OpenSim.Framework
872 { 872 {
873 string os = String.Empty; 873 string os = String.Empty;
874 874
875 if (System.Environment.OSVersion.Platform != PlatformID.Unix) 875 if (Environment.OSVersion.Platform != PlatformID.Unix)
876 { 876 {
877 os = System.Environment.OSVersion.ToString(); 877 os = Environment.OSVersion.ToString();
878 } 878 }
879 else 879 else
880 { 880 {
diff --git a/OpenSim/Framework/WearableItem.cs b/OpenSim/Framework/WearableItem.cs
index 414b135..7a4b4de 100644
--- a/OpenSim/Framework/WearableItem.cs
+++ b/OpenSim/Framework/WearableItem.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Framework
132 //int randNum = Util.RandomClass.Next(0, 1000); 132 //int randNum = Util.RandomClass.Next(0, 1000);
133 float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue; 133 float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue;
134 // float val =((float) randNum )/ ((float)(1000.0f / range)); 134 // float val =((float) randNum )/ ((float)(1000.0f / range));
135 float val = (float)OpenSim.Framework.Util.RandomClass.NextDouble() * range * 0.2f; 135 float val = (float)Util.RandomClass.NextDouble() * range * 0.2f;
136 setting.Value = setting.VisualParam.MinValue + (range / 2) + val; 136 setting.Value = setting.VisualParam.MinValue + (range / 2) + val;
137 } 137 }
138 } 138 }
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 4609ee8..5b23d5a 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -28,15 +28,15 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse;
32using log4net; 31using log4net;
33using log4net.Config; 32using log4net.Config;
33using OpenMetaverse;
34using OpenSim.Data;
34using OpenSim.Framework; 35using OpenSim.Framework;
35using OpenSim.Framework.AssetLoader.Filesystem; 36using OpenSim.Framework.AssetLoader.Filesystem;
36using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
38using OpenSim.Framework.Statistics; 39using OpenSim.Framework.Statistics;
39using OpenSim.Data;
40 40
41namespace OpenSim.Grid.AssetServer 41namespace OpenSim.Grid.AssetServer
42{ 42{
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index a44af6c..ba62c55 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -27,17 +27,16 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net;
31using System.Reflection; 30using System.Reflection;
32using System.Text; 31using System.Text;
33using System.Xml; 32using System.Xml;
34using System.Xml.Serialization; 33using System.Xml.Serialization;
35using OpenMetaverse;
36using log4net; 34using log4net;
35using OpenMetaverse;
36using OpenSim.Data;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Framework.Statistics; 39using OpenSim.Framework.Statistics;
40using OpenSim.Data;
41 40
42namespace OpenSim.Grid.AssetServer 41namespace OpenSim.Grid.AssetServer
43{ 42{
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index f98809d..5dc186c 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -26,15 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Text;
30using System.Collections; 29using System.Collections;
31using System.Collections.Generic; 30using System.Collections.Generic;
32using System.IO; 31using System.IO;
33using System.Reflection; 32using System.Reflection;
34using System.Xml; 33using System.Xml;
35using OpenMetaverse;
36using log4net; 34using log4net;
37using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenMetaverse;
38using OpenSim.Data; 37using OpenSim.Data;
39using OpenSim.Framework; 38using OpenSim.Framework;
40using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 9cc25e8..bcd1403 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -25,7 +25,6 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.IO; 29using System.IO;
31using System.Reflection; 30using System.Reflection;
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index 0032922..3b3bb42 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -25,7 +25,6 @@
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;
29using log4net.Config; 28using log4net.Config;
30 29
31namespace OpenSim.Grid.GridServer 30namespace OpenSim.Grid.GridServer
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 78d9f65..16d8154 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -28,14 +28,11 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using System.Threading;
33using System.Net; 31using System.Net;
34 32using System.Reflection;
35using OpenMetaverse;
36using log4net; 33using log4net;
37using Nwc.XmlRpc; 34using Nwc.XmlRpc;
38 35using OpenMetaverse;
39using OpenSim.Framework; 36using OpenSim.Framework;
40using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 862ae58..8ca7c3d 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -29,9 +29,9 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
34using log4net.Config; 33using log4net.Config;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 13f52ab..2f63ee9 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -28,12 +28,9 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse;
32using log4net; 31using log4net;
33using log4net.Config; 32using log4net.Config;
34
35using OpenSim.Framework; 33using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
39 36
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index 7a4a47f..36f8b91 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -29,13 +29,15 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Threading;
33using System.Reflection; 32using System.Reflection;
34using OpenMetaverse; 33using System.Threading;
34using System.Timers;
35using log4net; 35using log4net;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenMetaverse;
37using OpenSim.Data; 38using OpenSim.Data;
38using OpenSim.Framework; 39using OpenSim.Framework;
40using Timer=System.Timers.Timer;
39 41
40namespace OpenSim.Grid.MessagingServer 42namespace OpenSim.Grid.MessagingServer
41{ 43{
@@ -52,7 +54,7 @@ namespace OpenSim.Grid.MessagingServer
52 // a dictionary of all current regions this server knows about 54 // a dictionary of all current regions this server knows about
53 private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong,RegionProfileData>(); 55 private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong,RegionProfileData>();
54 56
55 private System.Timers.Timer reconnectTimer = new System.Timers.Timer(300000); // 5 mins 57 private Timer reconnectTimer = new Timer(300000); // 5 mins
56 58
57 public MessageService(MessageServerConfig cfg) 59 public MessageService(MessageServerConfig cfg)
58 { 60 {
@@ -502,7 +504,7 @@ namespace OpenSim.Grid.MessagingServer
502 return regionProfile; 504 return regionProfile;
503 } 505 }
504 506
505 public void registerWithUserServer(object sender, System.Timers.ElapsedEventArgs e) 507 public void registerWithUserServer(object sender, ElapsedEventArgs e)
506 { 508 {
507 registerWithUserServer(); 509 registerWithUserServer();
508 } 510 }
diff --git a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
index 7ea1ac7..08566bb 100644
--- a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
@@ -25,9 +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 System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 29using OpenMetaverse;
32 30
33namespace OpenSim.Grid.MessagingServer 31namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index 39fcadb..20342ab 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -26,8 +26,8 @@
26 */ 26 */
27 27
28using System.Collections; 28using System.Collections;
29using System.Reflection;
30using System.Net; 29using System.Net;
30using System.Reflection;
31using log4net; 31using log4net;
32using Nwc.XmlRpc; 32using Nwc.XmlRpc;
33using OpenSim.Data; 33using OpenSim.Data;
diff --git a/OpenSim/Grid/MessagingServer/PresenceService.cs b/OpenSim/Grid/MessagingServer/PresenceService.cs
index df5f687..d8cb755 100644
--- a/OpenSim/Grid/MessagingServer/PresenceService.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceService.cs
@@ -25,10 +25,6 @@
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;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Grid.MessagingServer 28namespace OpenSim.Grid.MessagingServer
33{ 29{
34 class PresenceService 30 class PresenceService
diff --git a/OpenSim/Grid/MessagingServer/UserManager.cs b/OpenSim/Grid/MessagingServer/UserManager.cs
index fc8f703..4b07df7 100644
--- a/OpenSim/Grid/MessagingServer/UserManager.cs
+++ b/OpenSim/Grid/MessagingServer/UserManager.cs
@@ -25,17 +25,9 @@
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;
29using System.Collections;
30using System.Collections.Generic;
31using System.Reflection;
32using System.Text.RegularExpressions;
33using OpenMetaverse; 28using OpenMetaverse;
34using log4net;
35using Nwc.XmlRpc;
36using OpenSim.Framework; 29using OpenSim.Framework;
37using OpenSim.Framework.Communications; 30using OpenSim.Framework.Communications;
38using OpenSim.Framework.Servers;
39 31
40namespace OpenSim.Grid.MessagingServer 32namespace OpenSim.Grid.MessagingServer
41{ 33{
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index 9d3f2bf..87647cd 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -27,10 +27,9 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net;
31using System.Reflection; 30using System.Reflection;
32using OpenMetaverse;
33using log4net; 31using log4net;
32using OpenMetaverse;
34using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
35 34
36namespace OpenSim.Grid.MessagingServer 35namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index dd3f0b7..3f75838 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -28,11 +28,10 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net;
32using System.Reflection; 31using System.Reflection;
33using OpenMetaverse;
34using log4net; 32using log4net;
35using log4net.Config; 33using log4net.Config;
34using OpenMetaverse;
36using OpenSim.Framework; 35using OpenSim.Framework;
37using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 6da67d7..8d16109 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -29,12 +29,12 @@ using System.Collections;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse; 32using System.Threading;
33using log4net; 33using log4net;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenMetaverse;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
37using System.Threading;
38 38
39namespace OpenSim.Grid.UserServer 39namespace OpenSim.Grid.UserServer
40{ 40{
diff --git a/OpenSim/Grid/UserServer/OpenIdService.cs b/OpenSim/Grid/UserServer/OpenIdService.cs
index 78e820e..187758f 100644
--- a/OpenSim/Grid/UserServer/OpenIdService.cs
+++ b/OpenSim/Grid/UserServer/OpenIdService.cs
@@ -31,10 +31,8 @@ using System.Collections.Specialized;
31using System.IO; 31using System.IO;
32using System.Net; 32using System.Net;
33using System.Web; 33using System.Web;
34using System.Text;
35using DotNetOpenId; 34using DotNetOpenId;
36using DotNetOpenId.Provider; 35using DotNetOpenId.Provider;
37using log4net;
38using OpenSim.Framework; 36using OpenSim.Framework;
39using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
40 38
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 0caefb1..905f4aa 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -30,9 +30,9 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using OpenMetaverse;
34using log4net; 33using log4net;
35using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenMetaverse;
36using OpenSim.Data; 36using OpenSim.Data;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 65e19b2..4da5f2e 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,9 +29,9 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
34using Nwc.XmlRpc; 33using Nwc.XmlRpc;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 0195bfa..b8fa786 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -27,14 +27,12 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net;
31using System.Reflection; 30using System.Reflection;
32using log4net; 31using log4net;
33using log4net.Config; 32using log4net.Config;
34using Nini.Config; 33using Nini.Config;
35using OpenSim.Framework; 34using OpenSim.Framework;
36using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
37using OpenSim.Region.Framework.Scenes;
38 36
39namespace OpenSim 37namespace OpenSim
40{ 38{
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 3492a19..228c0aa 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -26,18 +26,13 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Xml;
32using System.Threading;
33using System.IO; 29using System.IO;
34using OpenSim.Framework;
35using Nini;
36using Nini.Config;
37
38using System.Reflection; 30using System.Reflection;
31using System.Threading;
32using System.Xml;
39using log4net; 33using log4net;
40 34using Nini.Config;
35using OpenSim.Framework;
41 36
42namespace OpenSim 37namespace OpenSim
43{ 38{
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 03e22ca..7d4a39c 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -26,31 +26,21 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.IO;
32using System.Net;
33using System.Reflection; 30using System.Reflection;
34using System.Xml;
35using log4net; 31using log4net;
36using Nini.Config; 32using Nini.Config;
37using OpenSim.Framework; 33using OpenSim.Framework;
38using OpenSim.Framework.Console;
39using OpenSim.Framework.Servers;
40using OpenSim.Framework.Statistics;
41using OpenSim.Region.ClientStack;
42using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
43using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
44using OpenSim.Region.Communications.Local; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers;
45using OpenSim.Region.Communications.Hypergrid; 38using OpenSim.Region.Communications.Hypergrid;
46using OpenSim.Region.CoreModules; 39using OpenSim.Region.Communications.Local;
47using OpenSim.Region.Framework; 40using OpenSim.Region.Framework;
48using OpenSim.Region.Framework.Interfaces;
49using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
50using OpenSim.Region.Framework.Scenes.Hypergrid; 42using OpenSim.Region.Framework.Scenes.Hypergrid;
51 43
52using Timer = System.Timers.Timer;
53
54namespace OpenSim 44namespace OpenSim
55{ 45{
56 public class HGOpenSimNode : OpenSim 46 public class HGOpenSimNode : OpenSim
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index fbe3813..fdc55c7 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -29,20 +29,16 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Net;
33using System.Reflection; 32using System.Reflection;
34using System.Runtime; 33using System.Timers;
35using System.Threading;
36using OpenMetaverse;
37using log4net; 34using log4net;
38using Nini.Config; 35using Nini.Config;
36using OpenMetaverse;
39using OpenSim.Framework; 37using OpenSim.Framework;
40using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
41using OpenSim.Framework.Statistics; 39using OpenSim.Framework.Statistics;
42using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
44using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
45using Timer = System.Timers.Timer;
46 42
47namespace OpenSim 43namespace OpenSim
48{ 44{
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 43cb127..f4e28be 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -28,11 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net;
32using System.Reflection; 31using System.Reflection;
33using System.Text; 32using System.Text;
34using System.Threading;
35using OpenMetaverse;
36using log4net; 33using log4net;
37using Nini.Config; 34using Nini.Config;
38using OpenSim.Framework; 35using OpenSim.Framework;
@@ -44,7 +41,6 @@ using OpenSim.Framework.Statistics;
44using OpenSim.Region.ClientStack; 41using OpenSim.Region.ClientStack;
45using OpenSim.Region.Communications.Local; 42using OpenSim.Region.Communications.Local;
46using OpenSim.Region.Communications.OGS1; 43using OpenSim.Region.Communications.OGS1;
47using OpenSim.Region.CoreModules;
48using OpenSim.Region.Framework; 44using OpenSim.Region.Framework;
49using OpenSim.Region.Framework.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
50using OpenSim.Region.Framework.Scenes; 46using OpenSim.Region.Framework.Scenes;
@@ -446,7 +442,7 @@ namespace OpenSim
446 442
447 // Carrying on now causes a lot of confusion down the 443 // Carrying on now causes a lot of confusion down the
448 // line - we need to get the user's attention 444 // line - we need to get the user's attention
449 System.Environment.Exit(1); 445 Environment.Exit(1);
450 } 446 }
451 447
452 // We need to do this after we've initialized the 448 // We need to do this after we've initialized the
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index f947d06..a7b65cb 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -31,9 +31,6 @@ using System.Reflection;
31using log4net; 31using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.ClientStack;
35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache;
37 34
38namespace OpenSim.Region.ClientStack 35namespace OpenSim.Region.ClientStack
39{ 36{
diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
index 8bd5434..b0749c6 100644
--- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs
+++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
@@ -30,7 +30,6 @@ using System.Net.Sockets;
30using Nini.Config; 30using Nini.Config;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Framework.Scenes; 32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Framework.Communications.Cache;
34 33
35namespace OpenSim.Region.ClientStack 34namespace OpenSim.Region.ClientStack
36{ 35{
diff --git a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
index 8197ec7..df6534f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
@@ -25,9 +25,6 @@
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;
29using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse.Packets; 28using OpenMetaverse.Packets;
32 29
33namespace OpenSim.Region.ClientStack.LindenUDP 30namespace OpenSim.Region.ClientStack.LindenUDP
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index a785e64..3b8b48f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -33,17 +33,16 @@ using System.Text;
33using System.Threading; 33using System.Threading;
34using System.Timers; 34using System.Timers;
35using System.Xml; 35using System.Xml;
36using log4net;
36using OpenMetaverse; 37using OpenMetaverse;
37using OpenMetaverse.Packets; 38using OpenMetaverse.Packets;
38using OpenMetaverse.StructuredData;
39using log4net;
40using OpenSim.Framework; 39using OpenSim.Framework;
41using OpenSim.Framework.Client; 40using OpenSim.Framework.Client;
42using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
43using OpenSim.Framework.Statistics; 42using OpenSim.Framework.Statistics;
44using OpenSim.Region.Framework.Interfaces; 43using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.Framework.Scenes; 44using OpenSim.Region.Framework.Scenes;
46using Timer = System.Timers.Timer; 45using Timer=System.Timers.Timer;
47 46
48namespace OpenSim.Region.ClientStack.LindenUDP 47namespace OpenSim.Region.ClientStack.LindenUDP
49{ 48{
@@ -474,7 +473,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
474 m_PacketHandler.OnPacketStats += PopulateStats; 473 m_PacketHandler.OnPacketStats += PopulateStats;
475 474
476 RegisterLocalPacketHandlers(); 475 RegisterLocalPacketHandlers();
477 m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<OpenSim.Region.Framework.Interfaces.IJ2KDecoder>()); 476 m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<IJ2KDecoder>());
478 } 477 }
479 478
480 public void SetDebugPacketLevel(int newDebugPacketLevel) 479 public void SetDebugPacketLevel(int newDebugPacketLevel)
@@ -1230,7 +1229,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1230 fromAgent, toAgent, false, false, false); 1229 fromAgent, toAgent, false, false, false);
1231 } 1230 }
1232 1231
1233 System.Console.WriteLine("SendInstantMessage: " + msg); 1232 Console.WriteLine("SendInstantMessage: " + msg);
1234 } 1233 }
1235 else 1234 else
1236 OutPacket(msg, ThrottleOutPacketType.Task); 1235 OutPacket(msg, ThrottleOutPacketType.Task);
@@ -6857,15 +6856,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6857 groupTitlesRequest.AgentData.GroupID); 6856 groupTitlesRequest.AgentData.GroupID);
6858 6857
6859 groupTitlesReply.GroupData = 6858 groupTitlesReply.GroupData =
6860 new GroupTitlesReplyPacket. 6859 new GroupTitlesReplyPacket.GroupDataBlock[titles.Count];
6861 GroupDataBlock[titles.Count];
6862 6860
6863 int i = 0; 6861 int i = 0;
6864 foreach (GroupTitlesData d in titles) 6862 foreach (GroupTitlesData d in titles)
6865 { 6863 {
6866 groupTitlesReply.GroupData[i] = 6864 groupTitlesReply.GroupData[i] =
6867 new GroupTitlesReplyPacket. 6865 new GroupTitlesReplyPacket.GroupDataBlock();
6868 GroupDataBlock();
6869 6866
6870 groupTitlesReply.GroupData[i].Title = 6867 groupTitlesReply.GroupData[i].Title =
6871 Utils.StringToBytes(d.Name); 6868 Utils.StringToBytes(d.Name);
@@ -6980,8 +6977,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6980 groupRolesReply.AgentData.AgentID = AgentId; 6977 groupRolesReply.AgentData.AgentID = AgentId;
6981 6978
6982 groupRolesReply.GroupData = 6979 groupRolesReply.GroupData =
6983 new GroupRoleDataReplyPacket. 6980 new GroupRoleDataReplyPacket.GroupDataBlock();
6984 GroupDataBlock();
6985 6981
6986 groupRolesReply.GroupData.GroupID = 6982 groupRolesReply.GroupData.GroupID =
6987 groupRolesRequest.GroupData.GroupID; 6983 groupRolesRequest.GroupData.GroupID;
@@ -6997,15 +6993,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6997 titles.Count; 6993 titles.Count;
6998 6994
6999 groupRolesReply.RoleData = 6995 groupRolesReply.RoleData =
7000 new GroupRoleDataReplyPacket. 6996 new GroupRoleDataReplyPacket.RoleDataBlock[titles.Count];
7001 RoleDataBlock[titles.Count];
7002 6997
7003 int i = 0; 6998 int i = 0;
7004 foreach (GroupRolesData d in titles) 6999 foreach (GroupRolesData d in titles)
7005 { 7000 {
7006 groupRolesReply.RoleData[i] = 7001 groupRolesReply.RoleData[i] =
7007 new GroupRoleDataReplyPacket. 7002 new GroupRoleDataReplyPacket.RoleDataBlock();
7008 RoleDataBlock();
7009 7003
7010 groupRolesReply.RoleData[i].RoleID = 7004 groupRolesReply.RoleData[i].RoleID =
7011 d.RoleID; 7005 d.RoleID;
@@ -7051,15 +7045,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7051 (uint)mappings.Count; 7045 (uint)mappings.Count;
7052 7046
7053 groupRoleMembersReply.MemberData = 7047 groupRoleMembersReply.MemberData =
7054 new GroupRoleMembersReplyPacket. 7048 new GroupRoleMembersReplyPacket.MemberDataBlock[mappings.Count];
7055 MemberDataBlock[mappings.Count];
7056 7049
7057 int i = 0; 7050 int i = 0;
7058 foreach (GroupRoleMembersData d in mappings) 7051 foreach (GroupRoleMembersData d in mappings)
7059 { 7052 {
7060 groupRoleMembersReply.MemberData[i] = 7053 groupRoleMembersReply.MemberData[i] =
7061 new GroupRoleMembersReplyPacket. 7054 new GroupRoleMembersReplyPacket.MemberDataBlock();
7062 MemberDataBlock();
7063 7055
7064 groupRoleMembersReply.MemberData[i].RoleID = 7056 groupRoleMembersReply.MemberData[i].RoleID =
7065 d.RoleID; 7057 d.RoleID;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
index b801f7a..f79f62e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -27,16 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using System.Xml;
32using OpenMetaverse; 30using OpenMetaverse;
33using OpenMetaverse.Packets;
34using OpenSim.Framework; 31using OpenSim.Framework;
35using OpenSim.Framework.Client;
36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Statistics;
38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes;
40 32
41namespace OpenSim.Region.ClientStack.LindenUDP 33namespace OpenSim.Region.ClientStack.LindenUDP
42{ 34{
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 43a2e23..6f9e5d3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -27,13 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using C5;
30using OpenMetaverse; 31using OpenMetaverse;
32using OpenMetaverse.Imaging;
31using OpenSim.Framework; 33using OpenSim.Framework;
32using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
33using C5;
34using OpenSim.Framework.Communications.Cache;
35using OpenMetaverse.Imaging;
36
37 35
38namespace OpenSim.Region.ClientStack.LindenUDP 36namespace OpenSim.Region.ClientStack.LindenUDP
39{ 37{
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index 97d75e1..23118a2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -26,19 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Net;
32using System.Net.Sockets; 30using System.Net.Sockets;
33using System.Threading; 31using System.Threading;
34using System.Timers; 32using System.Timers;
35using System.Reflection;
36using OpenMetaverse; 33using OpenMetaverse;
37using OpenMetaverse.Packets; 34using OpenMetaverse.Packets;
38using Timer = System.Timers.Timer;
39using OpenSim.Framework; 35using OpenSim.Framework;
40using OpenSim.Region.ClientStack.LindenUDP; 36using Timer=System.Timers.Timer;
41using log4net;
42 37
43namespace OpenSim.Region.ClientStack.LindenUDP 38namespace OpenSim.Region.ClientStack.LindenUDP
44{ 39{
@@ -96,7 +91,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
96 private Dictionary<uint, int> m_DupeTracker = 91 private Dictionary<uint, int> m_DupeTracker =
97 new Dictionary<uint, int>(); 92 new Dictionary<uint, int>();
98 private uint m_DupeTrackerWindow = 30; 93 private uint m_DupeTrackerWindow = 30;
99 private int m_DupeTrackerLastCheck = System.Environment.TickCount; 94 private int m_DupeTrackerLastCheck = Environment.TickCount;
100 95
101 // Values for the SimStatsReporter 96 // Values for the SimStatsReporter
102 // 97 //
@@ -164,7 +159,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
164 { 159 {
165 m_Client = client; 160 m_Client = client;
166 m_PacketServer = server; 161 m_PacketServer = server;
167 m_DropSafeTimeout = System.Environment.TickCount + 15000; 162 m_DropSafeTimeout = Environment.TickCount + 15000;
168 163
169 m_PacketQueue = new LLPacketQueue(client.AgentId, userSettings); 164 m_PacketQueue = new LLPacketQueue(client.AgentId, userSettings);
170 165
@@ -225,9 +220,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
225 // acks being appended to the payload, just don't send 220 // acks being appended to the payload, just don't send
226 // any with them until libsl is fixed. 221 // any with them until libsl is fixed.
227 // 222 //
228 if (packet is OpenMetaverse.Packets.ViewerEffectPacket) 223 if (packet is ViewerEffectPacket)
229 return; 224 return;
230 if (packet is OpenMetaverse.Packets.SimStatsPacket) 225 if (packet is SimStatsPacket)
231 return; 226 return;
232 227
233 // Add acks to outgoing packets 228 // Add acks to outgoing packets
@@ -261,7 +256,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
261 item.Packet = packet; 256 item.Packet = packet;
262 item.Incoming = false; 257 item.Incoming = false;
263 item.throttleType = throttlePacketType; 258 item.throttleType = throttlePacketType;
264 item.TickCount = System.Environment.TickCount; 259 item.TickCount = Environment.TickCount;
265 item.Identifier = id; 260 item.Identifier = id;
266 item.Resends = 0; 261 item.Resends = 0;
267 item.Length = packet.ToBytes().Length; 262 item.Length = packet.ToBytes().Length;
@@ -272,7 +267,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
272 267
273 private void ResendUnacked() 268 private void ResendUnacked()
274 { 269 {
275 int now = System.Environment.TickCount; 270 int now = Environment.TickCount;
276 271
277 int intervalMs = 250; 272 int intervalMs = 250;
278 273
@@ -341,7 +336,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
341 } 336 }
342 337
343 m_NeedAck[packet.Header.Sequence].TickCount = 338 m_NeedAck[packet.Header.Sequence].TickCount =
344 System.Environment.TickCount; 339 Environment.TickCount;
345 340
346 QueuePacket(packet, ThrottleOutPacketType.Resend, 341 QueuePacket(packet, ThrottleOutPacketType.Resend,
347 data.Identifier); 342 data.Identifier);
@@ -463,10 +458,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
463 if (m_DupeTracker.Count < 1024) 458 if (m_DupeTracker.Count < 1024)
464 return; 459 return;
465 460
466 if (System.Environment.TickCount - m_DupeTrackerLastCheck < 2000) 461 if (Environment.TickCount - m_DupeTrackerLastCheck < 2000)
467 return; 462 return;
468 463
469 m_DupeTrackerLastCheck = System.Environment.TickCount; 464 m_DupeTrackerLastCheck = Environment.TickCount;
470 465
471 Dictionary<uint, int> packs = 466 Dictionary<uint, int> packs =
472 new Dictionary<uint, int>(m_DupeTracker); 467 new Dictionary<uint, int>(m_DupeTracker);
@@ -673,7 +668,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
673 item.Packet = packet; 668 item.Packet = packet;
674 item.Incoming = false; 669 item.Incoming = false;
675 item.throttleType = 0; 670 item.throttleType = 0;
676 item.TickCount = System.Environment.TickCount; 671 item.TickCount = Environment.TickCount;
677 item.Identifier = 0; 672 item.Identifier = 0;
678 item.Resends = 0; 673 item.Resends = 0;
679 item.Length = packet.ToBytes().Length; 674 item.Length = packet.ToBytes().Length;
@@ -741,7 +736,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
741 m_UnackedBytes += item.Length; 736 m_UnackedBytes += item.Length;
742 737
743 // Keep track of when this packet was sent out 738 // Keep track of when this packet was sent out
744 item.TickCount = System.Environment.TickCount; 739 item.TickCount = Environment.TickCount;
745 740
746 m_NeedAck[packet.Header.Sequence] = item; 741 m_NeedAck[packet.Header.Sequence] = item;
747 } 742 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 17c3f97..1c398d9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -27,23 +27,22 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using System.Threading; 31using System.Threading;
31using System.Timers; 32using System.Timers;
33using log4net;
32using OpenMetaverse; 34using OpenMetaverse;
33using OpenMetaverse.Packets;
34using OpenSim.Framework; 35using OpenSim.Framework;
35using OpenSim.Framework.Statistics; 36using OpenSim.Framework.Statistics;
36using OpenSim.Framework.Statistics.Interfaces; 37using OpenSim.Framework.Statistics.Interfaces;
37using OpenSim.Region.ClientStack;
38using Timer=System.Timers.Timer; 38using Timer=System.Timers.Timer;
39 39
40
41namespace OpenSim.Region.ClientStack.LindenUDP 40namespace OpenSim.Region.ClientStack.LindenUDP
42{ 41{
43 public class LLPacketQueue : IPullStatsProvider 42 public class LLPacketQueue : IPullStatsProvider
44 { 43 {
45 private static readonly log4net.ILog m_log 44 private static readonly ILog m_log
46 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 46
48 /// <summary> 47 /// <summary>
49 /// Is queueing enabled at all? 48 /// Is queueing enabled at all?
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index a42ae04..7305f34 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -27,12 +27,9 @@
27 27
28using System.Net; 28using System.Net;
29using System.Net.Sockets; 29using System.Net.Sockets;
30using System.Reflection;
31using log4net;
32using OpenMetaverse; 30using OpenMetaverse;
33using OpenMetaverse.Packets; 31using OpenMetaverse.Packets;
34using OpenSim.Framework; 32using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache;
36 33
37namespace OpenSim.Region.ClientStack.LindenUDP 34namespace OpenSim.Region.ClientStack.LindenUDP
38{ 35{
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index eb88715..7aea9a3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -31,11 +31,10 @@ using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using System.Reflection; 33using System.Reflection;
34using OpenMetaverse.Packets;
35using log4net; 34using log4net;
36using Nini.Config; 35using Nini.Config;
36using OpenMetaverse.Packets;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
40 39
41namespace OpenSim.Region.ClientStack.LindenUDP 40namespace OpenSim.Region.ClientStack.LindenUDP
@@ -304,7 +303,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
304 // the next set of UDP data is for a valid client. 303 // the next set of UDP data is for a valid client.
305 ResetServerEndPoint(e); 304 ResetServerEndPoint(e);
306 } 305 }
307 catch (System.ObjectDisposedException) 306 catch (ObjectDisposedException)
308 { 307 {
309 m_log.Info("[UDPSERVER]: UDP Object disposed. No need to worry about this if you're restarting the simulator."); 308 m_log.Info("[UDPSERVER]: UDP Object disposed. No need to worry about this if you're restarting the simulator.");
310 } 309 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
index d704967..ca26f5b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using System;
30 29
31namespace OpenSim.Region.ClientStack.LindenUDP 30namespace OpenSim.Region.ClientStack.LindenUDP
32{ 31{
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index b2cf14c..1f564b7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -26,17 +26,13 @@
26 */ 26 */
27 27
28using System.Net; 28using System.Net;
29using System.Threading; 29using log4net.Config;
30using log4net;
31using Nini.Config; 30using Nini.Config;
32using NUnit.Framework; 31using NUnit.Framework;
33using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework.SyntaxHelpers;
34using OpenMetaverse; 33using OpenMetaverse;
35using OpenMetaverse.Packets; 34using OpenMetaverse.Packets;
36using OpenSim.Framework; 35using OpenSim.Framework;
37using OpenSim.Framework.Communications;
38using OpenSim.Region.ClientStack;
39using OpenSim.Region.ClientStack.LindenUDP;
40 36
41namespace OpenSim.Region.ClientStack.LindenUDP.Tests 37namespace OpenSim.Region.ClientStack.LindenUDP.Tests
42{ 38{
@@ -51,7 +47,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
51 { 47 {
52 try 48 try
53 { 49 {
54 log4net.Config.XmlConfigurator.Configure(); 50 XmlConfigurator.Configure();
55 } 51 }
56 catch 52 catch
57 { 53 {
@@ -118,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
118 UseCircuitCodePacket uccp = new UseCircuitCodePacket(); 114 UseCircuitCodePacket uccp = new UseCircuitCodePacket();
119 115
120 UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock 116 UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock
121 = new OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock(); 117 = new UseCircuitCodePacket.CircuitCodeBlock();
122 uccpCcBlock.Code = circuitCode; 118 uccpCcBlock.Code = circuitCode;
123 uccpCcBlock.ID = agentId; 119 uccpCcBlock.ID = agentId;
124 uccpCcBlock.SessionID = sessionId; 120 uccpCcBlock.SessionID = sessionId;
@@ -169,7 +165,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
169 UseCircuitCodePacket uccp = new UseCircuitCodePacket(); 165 UseCircuitCodePacket uccp = new UseCircuitCodePacket();
170 166
171 UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock 167 UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock
172 = new OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock(); 168 = new UseCircuitCodePacket.CircuitCodeBlock();
173 uccpCcBlock.Code = myCircuitCode; 169 uccpCcBlock.Code = myCircuitCode;
174 uccpCcBlock.ID = myAgentUuid; 170 uccpCcBlock.ID = myAgentUuid;
175 uccpCcBlock.SessionID = mySessionUuid; 171 uccpCcBlock.SessionID = mySessionUuid;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
index 90d7d63..d4e906a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
@@ -25,8 +25,6 @@
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.Xml;
29using Nini.Config;
30using OpenMetaverse; 28using OpenMetaverse;
31using OpenSim.Framework; 29using OpenSim.Framework;
32using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
index d421f82..6e429a4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
@@ -25,14 +25,12 @@
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.Threading;
29using Nini.Config; 28using Nini.Config;
30using NUnit.Framework; 29using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 30using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 31using OpenMetaverse;
33using OpenMetaverse.Packets; 32using OpenMetaverse.Packets;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Region.ClientStack.LindenUDP;
36using OpenSim.Tests.Common.Mock; 34using OpenSim.Tests.Common.Mock;
37 35
38namespace OpenSim.Region.ClientStack.LindenUDP.Tests 36namespace OpenSim.Region.ClientStack.LindenUDP.Tests
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
index 507fe82..667014e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse;
30using OpenMetaverse.Packets; 29using OpenMetaverse.Packets;
31using OpenSim.Region.ClientStack.LindenUDP;
32 30
33namespace OpenSim.Region.ClientStack.LindenUDP.Tests 31namespace OpenSim.Region.ClientStack.LindenUDP.Tests
34{ 32{
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
index 91fadba..53506d3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
@@ -30,8 +30,6 @@ using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Net.Sockets; 31using System.Net.Sockets;
32using OpenMetaverse.Packets; 32using OpenMetaverse.Packets;
33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache;
35 33
36namespace OpenSim.Region.ClientStack.LindenUDP.Tests 34namespace OpenSim.Region.ClientStack.LindenUDP.Tests
37{ 35{
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 24ebd7e..55cf1ae 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -26,19 +26,16 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.IO;
30using System.Net; 29using System.Net;
31using System.Reflection; 30using System.Reflection;
32using OpenMetaverse;
33using log4net; 31using log4net;
34using Nini.Config; 32using Nini.Config;
33using OpenMetaverse;
35using OpenSim.Framework; 34using OpenSim.Framework;
36using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
37using OpenSim.Framework.Communications.Cache;
38using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
39using OpenSim.Region.Framework; 37using OpenSim.Region.Framework;
40using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.CoreModules;
42using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
43 40
44namespace OpenSim.Region.ClientStack 41namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 4de4b2b..c8a540b 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -25,14 +25,12 @@
25 * OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THE POSSIBILITY OF SUCH DAMAGE.
26 * 26 *
27 */ 27 */
28using System.Reflection;
29 28
29using System.Reflection;
30using log4net; 30using log4net;
31
32using OpenSim.Framework; 31using OpenSim.Framework;
33using OpenSim.Framework.Communications; 32using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Communications.OGS1;
36using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
37using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
38 36
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index 39e13d1..5feea4d 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -30,8 +30,8 @@
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Region.Communications.Local;
34using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
34using OpenSim.Region.Communications.Local;
35 35
36namespace OpenSim.Region.Communications.Hypergrid 36namespace OpenSim.Region.Communications.Hypergrid
37{ 37{
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index d93918d..72c0f42 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -31,30 +31,22 @@ using System;
31using System.Collections; 31using System.Collections;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using System.Drawing; 33using System.Drawing;
34using System.Drawing.Drawing2D;
35using System.Drawing.Imaging;
36using System.IO;
37using System.Net; 34using System.Net;
38using System.Net.Sockets; 35using System.Net.Sockets;
39using System.Reflection; 36using System.Reflection;
40using System.Runtime.Remoting; 37using System.Runtime.Remoting;
41using System.Runtime.Remoting.Channels;
42using System.Runtime.Remoting.Channels.Tcp;
43using System.Security.Authentication; 38using System.Security.Authentication;
44using System.Threading;
45using OpenMetaverse;
46using OpenMetaverse.Imaging;
47using log4net; 39using log4net;
48using Nwc.XmlRpc; 40using Nwc.XmlRpc;
41using OpenMetaverse;
42using OpenMetaverse.Imaging;
49using OpenSim.Framework; 43using OpenSim.Framework;
50using OpenSim.Framework.Communications; 44using OpenSim.Framework.Communications;
51using OpenSim.Framework.Communications.Cache; 45using OpenSim.Framework.Communications.Cache;
52using OpenSim.Framework.Servers; 46using OpenSim.Framework.Servers;
53using OpenSim.Region.Communications.Local;
54using OpenSim.Region.Communications.OGS1; 47using OpenSim.Region.Communications.OGS1;
55// using OpenSim.Region.Environment.Modules.Framework;
56using OpenSim.Region.Framework.Scenes; 48using OpenSim.Region.Framework.Scenes;
57using OpenSim.Region.Framework.Interfaces; 49// using OpenSim.Region.Environment.Modules.Framework;
58 50
59namespace OpenSim.Region.Communications.Hypergrid 51namespace OpenSim.Region.Communications.Hypergrid
60{ 52{
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index d1f416d..94646d2 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -29,18 +29,14 @@
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32 32using log4net;
33using OpenMetaverse;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using 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.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39 39
40using OpenMetaverse;
41
42using log4net;
43
44namespace OpenSim.Region.Communications.Hypergrid 40namespace OpenSim.Region.Communications.Hypergrid
45{ 41{
46 public class HGGridServicesGridMode : HGGridServices 42 public class HGGridServicesGridMode : HGGridServices
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index 0f6b4c7..ea8ac2e 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -25,6 +25,7 @@
25 * OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THE POSSIBILITY OF SUCH DAMAGE.
26 * 26 *
27 */ 27 */
28
28using System; 29using System;
29using System.Collections; 30using System.Collections;
30using System.Collections.Generic; 31using System.Collections.Generic;
@@ -35,19 +36,15 @@ using System.Runtime.Remoting;
35using System.Runtime.Remoting.Channels; 36using System.Runtime.Remoting.Channels;
36using System.Runtime.Remoting.Channels.Tcp; 37using System.Runtime.Remoting.Channels.Tcp;
37using System.Security.Authentication; 38using System.Security.Authentication;
38 39using log4net;
40using Nwc.XmlRpc;
41using OpenMetaverse;
39using OpenSim.Framework; 42using OpenSim.Framework;
40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 43using OpenSim.Framework.Servers;
43using OpenSim.Region.Communications.Local; 44using OpenSim.Region.Communications.Local;
44using OpenSim.Region.Communications.OGS1; 45using OpenSim.Region.Communications.OGS1;
45using OpenSim.Region.Framework.Scenes; 46using OpenSim.Region.Framework.Scenes;
46 47
47using OpenMetaverse;
48using Nwc.XmlRpc;
49using log4net;
50
51namespace OpenSim.Region.Communications.Hypergrid 48namespace OpenSim.Region.Communications.Hypergrid
52{ 49{
53 public class HGGridServicesStandalone : HGGridServices 50 public class HGGridServicesStandalone : HGGridServices
diff --git a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
index 874e8fb..8296910 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 084a9e9..e9eb18c 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -25,15 +25,9 @@
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;
29using System.Collections; 28using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Net;
32using System.Reflection;
33using System.Text.RegularExpressions;
34using OpenMetaverse; 30using OpenMetaverse;
35using log4net;
36using Nwc.XmlRpc;
37using OpenSim.Framework; 31using OpenSim.Framework;
38using OpenSim.Framework.Communications; 32using OpenSim.Framework.Communications;
39using OpenSim.Region.Communications.OGS1; 33using OpenSim.Region.Communications.OGS1;
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 6a3b80d..5df3c34 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36 36
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 5cb33cc..d4560be 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -27,8 +27,8 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection; 29using System.Reflection;
30using OpenMetaverse;
31using log4net; 30using log4net;
31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 5cd587d..3ad7249 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -30,8 +30,8 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using OpenMetaverse;
34using log4net; 33using log4net;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
37using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index ca48814..d5305cc 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO;
32using System.Net; 31using System.Net;
33using System.Net.Sockets; 32using System.Net.Sockets;
34using System.Reflection; 33using System.Reflection;
@@ -36,11 +35,9 @@ using System.Runtime.Remoting;
36using System.Runtime.Remoting.Channels; 35using System.Runtime.Remoting.Channels;
37using System.Runtime.Remoting.Channels.Tcp; 36using System.Runtime.Remoting.Channels.Tcp;
38using System.Security.Authentication; 37using System.Security.Authentication;
39using System.Threading;
40using OpenMetaverse;
41using log4net; 38using log4net;
42using Nini.Config;
43using Nwc.XmlRpc; 39using Nwc.XmlRpc;
40using OpenMetaverse;
44using OpenSim.Framework; 41using OpenSim.Framework;
45using OpenSim.Framework.Communications; 42using OpenSim.Framework.Communications;
46using OpenSim.Framework.Servers; 43using OpenSim.Framework.Servers;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 0195a58..dd4d0aa 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Runtime.Remoting; 30using System.Runtime.Remoting;
31using OpenMetaverse;
32using log4net; 31using log4net;
32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34 34
35namespace OpenSim.Region.Communications.OGS1 35namespace OpenSim.Region.Communications.OGS1
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index b9e8394..49d5938 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
index c690def..0f4c732 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -29,8 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 94a7a5c..b4b73b0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using OpenMetaverse;
35using log4net; 34using log4net;
36using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39 39
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
index 2be1eaa..3c24b05 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
@@ -25,13 +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 System.Collections.Generic;
29//using System.Reflection; 28//using System.Reflection;
30//using log4net; 29//using log4net;
31using OpenMetaverse;
32using OpenSim.Framework;
33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.Framework.Interfaces;
35 30
36namespace OpenSim.Region.CoreModules.Agent.AssetTransaction 31namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
37{ 32{
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index b4dbaa1..0bf91e0 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -25,12 +25,13 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
30using log4net;
30using OpenMetaverse; 31using OpenMetaverse;
31using OpenSim.Framework; 32using OpenSim.Framework;
32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34using OpenSim.Region.Framework.Scenes;
34 35
35namespace OpenSim.Region.CoreModules.Agent.AssetTransaction 36namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
36{ 37{
@@ -39,7 +40,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
39 /// </summary> 40 /// </summary>
40 public class AgentAssetTransactions 41 public class AgentAssetTransactions
41 { 42 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 44
44 // Fields 45 // Fields
45 private bool m_dumpAssetsToFile; 46 private bool m_dumpAssetsToFile;
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 77dfd44..3fd4a70 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -27,8 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse;
31using Nini.Config; 30using Nini.Config;
31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index aef2664..9af764f 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -30,10 +30,8 @@ using System.IO;
30using System.Reflection; 30using System.Reflection;
31using log4net; 31using log4net;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenMetaverse.Packets;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Framework.Scenes;
37 35
38namespace OpenSim.Region.CoreModules.Agent.AssetTransaction 36namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
39{ 37{
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 4f7f177..6327466 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -32,11 +32,9 @@ using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Communications.Capabilities;
37using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
39using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 37using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
40 38
41namespace OpenSim.Region.CoreModules.Agent.Capabilities 39namespace OpenSim.Region.CoreModules.Agent.Capabilities
42{ 40{
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
index 107855d..4bfa18f 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
@@ -27,27 +27,29 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using System.Threading; 31using System.Threading;
31using OpenMetaverse; 32using log4net;
32using Nini.Config; 33using Nini.Config;
34using OpenMetaverse;
33using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache;
34using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
36using OpenSim.Framework.Communications.Cache;
37using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>; 39using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>;
38 40
39namespace OpenSim.Region.CoreModules.Agent.TextureDownload 41namespace OpenSim.Region.CoreModules.Agent.TextureDownload
40{ 42{
41 public class TextureDownloadModule : IRegionModule 43 public class TextureDownloadModule : IRegionModule
42 { 44 {
43 private static readonly log4net.ILog m_log 45 private static readonly ILog m_log
44 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 46 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 47
46 /// <summary> 48 /// <summary>
47 /// There is one queue for all textures waiting to be sent, regardless of the requesting user. 49 /// There is one queue for all textures waiting to be sent, regardless of the requesting user.
48 /// </summary> 50 /// </summary>
49 private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_queueSenders 51 private readonly BlockingQueue m_queueSenders
50 = new OpenSim.Framework.BlockingQueue<ITextureSender>(); 52 = new BlockingQueue();
51 53
52 /// <summary> 54 /// <summary>
53 /// Each user has their own texture download service. 55 /// Each user has their own texture download service.
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs
index 7309282..acc8c98 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -25,10 +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 System.Reflection;
29using log4net;
30using OpenMetaverse; 28using OpenMetaverse;
31using OpenMetaverse.Packets;
32using OpenSim.Framework; 29using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
34 31
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
index 675bb0f..2f98bab 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -27,8 +27,8 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection; 29using System.Reflection;
30using OpenMetaverse;
31using log4net; 30using log4net;
31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications.Limit; 33using OpenSim.Framework.Communications.Limit;
34using OpenSim.Framework.Statistics; 34using OpenSim.Framework.Statistics;
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index df672b8..3a1d9a3 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -26,11 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
29using System.IO; 30using System.IO;
30using System.Reflection; 31using System.Reflection;
31using System.Text; 32using System.Text;
32using System.Threading;
33using System.Collections.Generic;
34using log4net; 33using log4net;
35using Nini.Config; 34using Nini.Config;
36using OpenMetaverse; 35using OpenMetaverse;
@@ -166,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
166 private void doJ2kDecode(UUID AssetId, byte[] j2kdata) 165 private void doJ2kDecode(UUID AssetId, byte[] j2kdata)
167 { 166 {
168 int DecodeTime = 0; 167 int DecodeTime = 0;
169 DecodeTime = System.Environment.TickCount; 168 DecodeTime = Environment.TickCount;
170 OpenJPEG.J2KLayerInfo[] layers = new OpenJPEG.J2KLayerInfo[0]; // Dummy result for if it fails. Informs that there's only full quality 169 OpenJPEG.J2KLayerInfo[] layers = new OpenJPEG.J2KLayerInfo[0]; // Dummy result for if it fails. Informs that there's only full quality
171 170
172 if (!OpenJpegFail) 171 if (!OpenJpegFail)
@@ -198,7 +197,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
198 197
199 198
200 // Write out decode time 199 // Write out decode time
201 m_log.InfoFormat("[J2KDecoderModule]: {0} Decode Time: {1}", System.Environment.TickCount - DecodeTime, 200 m_log.InfoFormat("[J2KDecoderModule]: {0} Decode Time: {1}", Environment.TickCount - DecodeTime,
202 AssetId); 201 AssetId);
203 202
204 } 203 }
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
index df553ac..ec95187 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
@@ -26,12 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using NUnit.Framework; 29using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 30using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 31using OpenMetaverse;
33using OpenSim.Framework; 32using OpenSim.Framework;
34using OpenSim.Region.CoreModules.Agent.TextureSender;
35using OpenSim.Tests.Common.Mock; 33using OpenSim.Tests.Common.Mock;
36 34
37namespace OpenSim.Region.CoreModules.Agent.TextureSender 35namespace OpenSim.Region.CoreModules.Agent.TextureSender
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
index b3ac624..dde8566 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
@@ -27,7 +27,6 @@
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using OpenMetaverse.Packets;
31using log4net; 30using log4net;
32using OpenSim.Framework; 31using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index cb81c0d..1a2207f 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -27,8 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse;
31using Nini.Config; 30using Nini.Config;
31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index d084dbd..38b9dca 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -25,19 +25,16 @@
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;
29using System.Collections.Generic; 29using System.Reflection;
30using System.Reflection; 30using log4net;
31 31using Nini.Config;
32using System.Threading; 32using OpenMetaverse;
33using OpenMetaverse; 33using OpenSim.Framework;
34using log4net; 34using OpenSim.Framework.Communications.Cache;
35using Nini.Config; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Framework; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Framework.Communications.Cache; 37
38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes;
40
41namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory 38namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
42{ 39{
43 public class AvatarFactoryModule : IAvatarFactory, IRegionModule 40 public class AvatarFactoryModule : IAvatarFactory, IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index f036faf..323cb69 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -25,20 +25,16 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.Reflection;
31using System.Net.Sockets; 31using log4net;
32using System.Reflection; 32using Nini.Config;
33using System.Text.RegularExpressions; 33using OpenMetaverse;
34using System.Threading; 34using OpenSim.Framework;
35using OpenMetaverse; 35using OpenSim.Region.Framework.Interfaces;
36using log4net; 36using OpenSim.Region.Framework.Scenes;
37using Nini.Config; 37
38using OpenSim.Framework;
39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes;
41
42namespace OpenSim.Region.CoreModules.Avatar.Chat 38namespace OpenSim.Region.CoreModules.Avatar.Chat
43{ 39{
44 public class ChatModule : IRegionModule 40 public class ChatModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 1ed608a..f4dffb5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -25,22 +25,12 @@
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;
29using System.Collections; 29using System.Collections.Generic;
30using System.Collections.Generic; 30using Nini.Config;
31using System.Net; 31using OpenSim.Region.Framework.Interfaces;
32using System.Net.Sockets; 32using OpenSim.Region.Framework.Scenes;
33using System.Reflection; 33
34using System.Xml;
35using OpenMetaverse;
36using log4net;
37using Nini.Config;
38using Nwc.XmlRpc;
39using OpenSim.Framework;
40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Framework.Communications.Cache;
43
44namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule 34namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
45{ 35{
46 public class CombatModule : IRegionModule 36 public class CombatModule : IRegionModule
@@ -117,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
117 foundResult = true; 107 foundResult = true;
118 } 108 }
119 } 109 }
120 } catch (System.InvalidOperationException) 110 } catch (InvalidOperationException)
121 { 111 {
122 112
123 } 113 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 0a1de44..4ea9958 100644
--- a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -25,23 +25,23 @@
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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using System.Reflection; 33using System.Reflection;
34using System.Xml; 34using System.Xml;
35using log4net; 35using log4net;
36using Nini.Config; 36using Nini.Config;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenMetaverse; 38using 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.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes; 43using OpenSim.Region.Framework.Scenes;
44 44
45namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney 45namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney
46{ 46{
47 /// <summary> 47 /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 7326373..6dbc774 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -25,15 +25,13 @@
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.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection; 29using Nini.Config;
30using log4net; 30using OpenMetaverse;
31using Nini.Config; 31using OpenSim.Framework;
32using OpenMetaverse; 32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Framework; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.Framework.Interfaces; 34
35using OpenSim.Region.Framework.Scenes;
36
37namespace OpenSim.Region.CoreModules.Avatar.Dialog 35namespace OpenSim.Region.CoreModules.Avatar.Dialog
38{ 36{
39 public class DialogModule : IRegionModule, IDialogModule 37 public class DialogModule : IRegionModule, IDialogModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index fb4d08a..98683b7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -25,20 +25,19 @@
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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse; 32using log4net;
33using log4net; 33using Nini.Config;
34using Nini.Config; 34using Nwc.XmlRpc;
35using Nwc.XmlRpc; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
38using OpenSim.Framework.Servers; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Region.Framework.Scenes; 40
41
42namespace OpenSim.Region.CoreModules.Avatar.Friends 41namespace OpenSim.Region.CoreModules.Avatar.Friends
43{ 42{
44 /* 43 /*
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index a3a642f..d2bd803 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -25,16 +25,15 @@
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 log4net; 28using System.Reflection;
29using Nini.Config; 29using log4net;
30using OpenMetaverse; 30using Nini.Config;
31using OpenSim.Framework; 31using OpenMetaverse;
32using OpenSim.Framework.Communications; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using System.Reflection; 36
37
38namespace OpenSim.Region.CoreModules.Avatar.Gestures 37namespace OpenSim.Region.CoreModules.Avatar.Gestures
39{ 38{
40 public class GesturesModule : IRegionModule 39 public class GesturesModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index 92d0fdd..4786cab 100644
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -25,16 +25,15 @@
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; 29using System.Reflection;
30using System.Reflection; 30using log4net;
31using OpenMetaverse; 31using Nini.Config;
32using log4net; 32using OpenMetaverse;
33using Nini.Config; 33using OpenSim.Framework;
34using OpenSim.Framework; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Framework.Scenes; 36
37
38namespace OpenSim.Region.CoreModules.Avatar.Groups 37namespace OpenSim.Region.CoreModules.Avatar.Groups
39{ 38{
40 public class GroupsModule : IRegionModule 39 public class GroupsModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 3ad2c91..7556388 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -24,21 +24,16 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System.Collections.Generic;
28using System.Collections; 28using System.Reflection;
29using System.Collections.Generic; 29using log4net;
30using System.Reflection; 30using Nini.Config;
31using System.Net; 31using OpenMetaverse;
32using System.Threading; 32using OpenSim.Framework;
33using OpenMetaverse; 33using OpenSim.Framework.Client;
34using log4net; 34using OpenSim.Region.Framework.Interfaces;
35using Nini.Config; 35using OpenSim.Region.Framework.Scenes;
36using Nwc.XmlRpc; 36
37using OpenSim.Framework;
38using OpenSim.Framework.Client;
39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes;
41
42namespace OpenSim.Region.CoreModules.Avatar.InstantMessage 37namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
43{ 38{
44 public class InstantMessageModule : IRegionModule 39 public class InstantMessageModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 91c22eb..beff362 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -24,21 +24,19 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System;
28using System.Collections; 28using System.Collections;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Net;
31using System.Net; 31using System.Reflection;
32using System.Threading; 32using log4net;
33using OpenMetaverse; 33using Nini.Config;
34using log4net; 34using Nwc.XmlRpc;
35using Nini.Config; 35using OpenMetaverse;
36using Nwc.XmlRpc; 36using OpenSim.Framework;
37using OpenSim.Framework; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Framework.Client; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Framework.Interfaces; 39
40using OpenSim.Region.Framework.Scenes;
41
42namespace OpenSim.Region.CoreModules.Avatar.InstantMessage 40namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
43{ 41{
44 public class MessageTransferModule : IRegionModule, IMessageTransferModule 42 public class MessageTransferModule : IRegionModule, IMessageTransferModule
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index 49fd70a..3f41457 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -24,21 +24,18 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System.Collections;
28using System.Collections; 28using System.Collections.Generic;
29using System.Collections.Generic; 29using System.Net;
30using System.Reflection; 30using System.Reflection;
31using System.Net; 31using log4net;
32using System.Threading; 32using Nini.Config;
33using OpenMetaverse; 33using Nwc.XmlRpc;
34using log4net; 34using OpenMetaverse;
35using Nini.Config; 35using OpenSim.Framework;
36using Nwc.XmlRpc; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Framework; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Framework.Client; 38
39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes;
41
42namespace OpenSim.Region.CoreModules.Avatar.InstantMessage 39namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
43{ 40{
44 public class PresenceModule : IRegionModule, IPresenceModule 41 public class PresenceModule : IRegionModule, IPresenceModule
@@ -344,7 +341,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
344 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); 341 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
345 } 342 }
346 } 343 }
347 catch (System.Net.WebException) 344 catch (WebException)
348 { 345 {
349 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); 346 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
350 } 347 }
@@ -367,7 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
367 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); 364 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
368 } 365 }
369 } 366 }
370 catch (System.Net.WebException) 367 catch (WebException)
371 { 368 {
372 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); 369 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
373 } 370 }
@@ -392,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
392 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString()); 389 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
393 } 390 }
394 } 391 }
395 catch (System.Net.WebException) 392 catch (WebException)
396 { 393 {
397 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString()); 394 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
398 } 395 }
@@ -417,7 +414,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
417 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString()); 414 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
418 } 415 }
419 } 416 }
420 catch (System.Net.WebException) 417 catch (WebException)
421 { 418 {
422 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString()); 419 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
423 } 420 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index c5cffa3..5ae5b4b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -25,22 +25,20 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.IO.Compression; 31using System.IO.Compression;
32using System.Reflection; 32using System.Reflection;
33using System.Xml; 33using System.Text;
34using OpenMetaverse; 34using System.Xml;
35using OpenSim.Region.Framework.Scenes; 35using log4net;
36using OpenSim.Region.CoreModules.World.Archiver; 36using OpenMetaverse;
37using OpenSim.Region.CoreModules.World.Serialiser; 37using OpenSim.Framework;
38using OpenSim.Framework; 38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Region.CoreModules.World.Archiver;
41using log4net; 41
42
43
44namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver 42namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
45{ 43{
46 public class InventoryArchiveReadRequest 44 public class InventoryArchiveReadRequest
@@ -48,7 +46,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 47
50 protected TarArchiveReader archive; 48 protected TarArchiveReader archive;
51 private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); 49 private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
52 50
53 private string m_firstName; 51 private string m_firstName;
54 private string m_lastName; 52 private string m_lastName;
@@ -98,13 +96,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
98 item.ID = UUID.Parse(reader.ReadString()); 96 item.ID = UUID.Parse(reader.ReadString());
99 reader.ReadEndElement(); 97 reader.ReadEndElement();
100 reader.ReadStartElement("InvType"); 98 reader.ReadStartElement("InvType");
101 item.InvType = System.Convert.ToInt32(reader.ReadString()); 99 item.InvType = Convert.ToInt32(reader.ReadString());
102 reader.ReadEndElement(); 100 reader.ReadEndElement();
103 reader.ReadStartElement("CreatorUUID"); 101 reader.ReadStartElement("CreatorUUID");
104 item.Creator = UUID.Parse(reader.ReadString()); 102 item.Creator = UUID.Parse(reader.ReadString());
105 reader.ReadEndElement(); 103 reader.ReadEndElement();
106 reader.ReadStartElement("CreationDate"); 104 reader.ReadStartElement("CreationDate");
107 item.CreationDate = System.Convert.ToInt32(reader.ReadString()); 105 item.CreationDate = Convert.ToInt32(reader.ReadString());
108 reader.ReadEndElement(); 106 reader.ReadEndElement();
109 reader.ReadStartElement("Owner"); 107 reader.ReadStartElement("Owner");
110 item.Owner = UUID.Parse(reader.ReadString()); 108 item.Owner = UUID.Parse(reader.ReadString());
@@ -121,37 +119,37 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
121 reader.ReadEndElement(); 119 reader.ReadEndElement();
122 } 120 }
123 reader.ReadStartElement("AssetType"); 121 reader.ReadStartElement("AssetType");
124 item.AssetType = System.Convert.ToInt32(reader.ReadString()); 122 item.AssetType = Convert.ToInt32(reader.ReadString());
125 reader.ReadEndElement(); 123 reader.ReadEndElement();
126 reader.ReadStartElement("AssetID"); 124 reader.ReadStartElement("AssetID");
127 item.AssetID = UUID.Parse(reader.ReadString()); 125 item.AssetID = UUID.Parse(reader.ReadString());
128 reader.ReadEndElement(); 126 reader.ReadEndElement();
129 reader.ReadStartElement("SaleType"); 127 reader.ReadStartElement("SaleType");
130 item.SaleType = System.Convert.ToByte(reader.ReadString()); 128 item.SaleType = Convert.ToByte(reader.ReadString());
131 reader.ReadEndElement(); 129 reader.ReadEndElement();
132 reader.ReadStartElement("SalePrice"); 130 reader.ReadStartElement("SalePrice");
133 item.SalePrice = System.Convert.ToInt32(reader.ReadString()); 131 item.SalePrice = Convert.ToInt32(reader.ReadString());
134 reader.ReadEndElement(); 132 reader.ReadEndElement();
135 reader.ReadStartElement("BasePermissions"); 133 reader.ReadStartElement("BasePermissions");
136 item.BasePermissions = System.Convert.ToUInt32(reader.ReadString()); 134 item.BasePermissions = Convert.ToUInt32(reader.ReadString());
137 reader.ReadEndElement(); 135 reader.ReadEndElement();
138 reader.ReadStartElement("CurrentPermissions"); 136 reader.ReadStartElement("CurrentPermissions");
139 item.CurrentPermissions = System.Convert.ToUInt32(reader.ReadString()); 137 item.CurrentPermissions = Convert.ToUInt32(reader.ReadString());
140 reader.ReadEndElement(); 138 reader.ReadEndElement();
141 reader.ReadStartElement("EveryOnePermssions"); 139 reader.ReadStartElement("EveryOnePermssions");
142 item.EveryOnePermissions = System.Convert.ToUInt32(reader.ReadString()); 140 item.EveryOnePermissions = Convert.ToUInt32(reader.ReadString());
143 reader.ReadEndElement(); 141 reader.ReadEndElement();
144 reader.ReadStartElement("NextPermissions"); 142 reader.ReadStartElement("NextPermissions");
145 item.NextPermissions = System.Convert.ToUInt32(reader.ReadString()); 143 item.NextPermissions = Convert.ToUInt32(reader.ReadString());
146 reader.ReadEndElement(); 144 reader.ReadEndElement();
147 reader.ReadStartElement("Flags"); 145 reader.ReadStartElement("Flags");
148 item.Flags = System.Convert.ToUInt32(reader.ReadString()); 146 item.Flags = Convert.ToUInt32(reader.ReadString());
149 reader.ReadEndElement(); 147 reader.ReadEndElement();
150 reader.ReadStartElement("GroupID"); 148 reader.ReadStartElement("GroupID");
151 item.GroupID = UUID.Parse(reader.ReadString()); 149 item.GroupID = UUID.Parse(reader.ReadString());
152 reader.ReadEndElement(); 150 reader.ReadEndElement();
153 reader.ReadStartElement("GroupOwned"); 151 reader.ReadStartElement("GroupOwned");
154 item.GroupOwned = System.Convert.ToBoolean(reader.ReadString()); 152 item.GroupOwned = Convert.ToBoolean(reader.ReadString());
155 reader.ReadEndElement(); 153 reader.ReadEndElement();
156 //reader.ReadStartElement("ParentFolderID"); 154 //reader.ReadStartElement("ParentFolderID");
157 //item.Folder = UUID.Parse(reader.ReadString()); 155 //item.Folder = UUID.Parse(reader.ReadString());
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index bfa4de9..da4785b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -25,20 +25,19 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.IO.Compression; 31using System.IO.Compression;
32using System.Reflection; 32using System.Reflection;
33using System.Xml; 33using System.Xml;
34using OpenMetaverse; 34using log4net;
35using OpenSim.Region.Framework.Scenes; 35using OpenMetaverse;
36using OpenSim.Region.CoreModules.World.Archiver; 36using OpenSim.Framework;
37using OpenSim.Framework; 37using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications.Cache;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Region.CoreModules.World.Archiver;
40using log4net; 40
41
42namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver 41namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
43{ 42{
44 public class InventoryArchiveWriteRequest 43 public class InventoryArchiveWriteRequest
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index a684b69..b025a31 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -25,17 +25,17 @@
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.Collections.Generic; 28using System.Collections.Generic;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using log4net; 31using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver 39namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
40{ 40{
41 /// <summary> 41 /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index d2cf6c9..98d952c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -25,18 +25,17 @@
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;
29using System.Collections; 29using System.Collections.Generic;
30using System.Collections.Generic; 30using System.Reflection;
31using System.Reflection; 31using log4net;
32using OpenMetaverse; 32using Nini.Config;
33using log4net; 33using OpenMetaverse;
34using Nini.Config; 34using OpenSim.Framework;
35using OpenSim.Framework; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Framework.Communications.Cache; 38
39
40namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer 39namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
41{ 40{
42 public class InventoryTransferModule : IInventoryTransferModule, IRegionModule 41 public class InventoryTransferModule : IInventoryTransferModule, IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index ebf4f0a..c0e4b48 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -25,21 +25,16 @@
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;
29using System.Collections; 29using System.Collections.Generic;
30using System.Collections.Generic; 30using System.Reflection;
31using System.Reflection; 31using log4net;
32using System.Net; 32using Nini.Config;
33using System.Threading; 33using OpenMetaverse;
34using OpenMetaverse; 34using OpenSim.Framework;
35using log4net; 35using OpenSim.Region.Framework.Interfaces;
36using Nini.Config; 36using OpenSim.Region.Framework.Scenes;
37using Nwc.XmlRpc; 37
38using OpenSim.Framework;
39using OpenSim.Framework.Client;
40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes;
42
43namespace OpenSim.Region.CoreModules.Avatar.Lure 38namespace OpenSim.Region.CoreModules.Avatar.Lure
44{ 39{
45 public class LureModule : IRegionModule 40 public class LureModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
index 193307d..ab65f8e 100644
--- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,19 +25,19 @@
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;
29using System.Collections; 29using System.Collections;
30using System.Reflection; 30using System.Reflection;
31using log4net; 31using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenMetaverse.StructuredData; 34using OpenMetaverse.StructuredData;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 39using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
40 40
41namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps 41namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
42{ 42{
43 public class ObjectAdd : IRegionModule 43 public class ObjectAdd : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
index 6ea5b56..74e5b4b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -25,16 +25,16 @@
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;
29using System.Globalization; 29using System.Globalization;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse; 31using log4net;
32using log4net; 32using Nini.Config;
33using Nini.Config; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.CoreModules.Avatar.Profiles 38namespace OpenSim.Region.CoreModules.Avatar.Profiles
39{ 39{
40 public class AvatarProfilesModule : IRegionModule 40 public class AvatarProfilesModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index 98536ed..ac40a17 100644
--- a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -24,20 +24,12 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System;
28using System.Collections;
29using System.Collections.Generic; 27using System.Collections.Generic;
30using System.Net;
31using System.Net.Sockets;
32using System.Reflection; 28using System.Reflection;
33using System.Threading;
34using System.Xml;
35using OpenMetaverse;
36using log4net; 29using log4net;
37using Nini.Config; 30using Nini.Config;
38using Nwc.XmlRpc; 31using OpenMetaverse;
39using OpenSim.Framework; 32using OpenSim.Framework;
40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
43 35
diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
index 8a4bb09..3574b39 100644
--- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
@@ -24,29 +24,23 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System;
28using System.Collections; 28using System.Collections;
29using System.Collections.Generic; 29using System.IO;
30using System.IO; 30using System.Net;
31using System.Net; 31using System.Reflection;
32using System.Net.Sockets; 32using System.Text;
33using System.Reflection; 33using log4net;
34using System.Threading; 34using Nini.Config;
35using System.Xml; 35using OpenMetaverse;
36using OpenMetaverse; 36using OpenMetaverse.StructuredData;
37using OpenMetaverse.StructuredData; 37using OpenSim.Framework;
38using log4net; 38using OpenSim.Framework.Communications;
39using Nini.Config; 39using OpenSim.Region.CoreModules.Communications.Local;
40using Nwc.XmlRpc; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Framework; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Framework.Communications; 42using OpenSim.Region.Framework.Scenes.Hypergrid;
43using OpenSim.Framework.Communications.Cache; 43
44using OpenSim.Framework.Servers;
45using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Framework.Scenes.Hypergrid;
48using OpenSim.Region.CoreModules.Communications.Local;
49
50namespace OpenSim.Region.CoreModules.Communications.REST 44namespace OpenSim.Region.CoreModules.Communications.REST
51{ 45{
52 public class RESTInterregionComms : IRegionModule, IInterregionCommsOut 46 public class RESTInterregionComms : IRegionModule, IInterregionCommsOut
@@ -278,7 +272,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
278 try 272 try
279 { 273 {
280 strBuffer = OSDParser.SerializeJsonString(args); 274 strBuffer = OSDParser.SerializeJsonString(args);
281 System.Text.UTF8Encoding str = new System.Text.UTF8Encoding(); 275 UTF8Encoding str = new UTF8Encoding();
282 buffer = str.GetBytes(strBuffer); 276 buffer = str.GetBytes(strBuffer);
283 277
284 } 278 }
@@ -363,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
363 try 357 try
364 { 358 {
365 strBuffer = OSDParser.SerializeJsonString(args); 359 strBuffer = OSDParser.SerializeJsonString(args);
366 System.Text.UTF8Encoding str = new System.Text.UTF8Encoding(); 360 UTF8Encoding str = new UTF8Encoding();
367 buffer = str.GetBytes(strBuffer); 361 buffer = str.GetBytes(strBuffer);
368 362
369 } 363 }
@@ -509,7 +503,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
509 try 503 try
510 { 504 {
511 strBuffer = OSDParser.SerializeJsonString(args); 505 strBuffer = OSDParser.SerializeJsonString(args);
512 System.Text.UTF8Encoding str = new System.Text.UTF8Encoding(); 506 UTF8Encoding str = new UTF8Encoding();
513 buffer = str.GetBytes(strBuffer); 507 buffer = str.GetBytes(strBuffer);
514 508
515 } 509 }
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index e81466a..3999213 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -25,32 +25,23 @@
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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Net.Sockets; 32using System.Reflection;
33using System.Reflection; 33using System.Threading;
34using System.Threading; 34using log4net;
35using System.Xml; 35using Nini.Config;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenMetaverse.Packets; 37using OpenMetaverse.Packets;
38using OpenMetaverse.StructuredData; 38using OpenMetaverse.StructuredData;
39using log4net; 39using OpenSim.Framework;
40using Nini.Config; 40using OpenSim.Framework.Servers;
41using Nwc.XmlRpc; 41using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Framework; 42using OpenSim.Region.Framework.Scenes;
43using OpenSim.Framework.Communications.Cache; 43using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
44using OpenSim.Framework.Communications.Capabilities; 44using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
45using OpenSim.Framework.Servers;
46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.Framework.Scenes;
48
49using OSD = OpenMetaverse.StructuredData.OSD;
50using OSDMap = OpenMetaverse.StructuredData.OSDMap;
51using OSDArray = OpenMetaverse.StructuredData.OSDArray;
52using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
53using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
54 45
55namespace OpenSim.Region.CoreModules.Framework.EventQueue 46namespace OpenSim.Region.CoreModules.Framework.EventQueue
56{ 47{
@@ -326,7 +317,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
326 m_scene.CommsManager.HttpServer.AddHTTPHandler( 317 m_scene.CommsManager.HttpServer.AddHTTPHandler(
327 capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2); 318 capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
328 319
329 Random rnd = new Random(System.Environment.TickCount); 320 Random rnd = new Random(Environment.TickCount);
330 lock (m_ids) 321 lock (m_ids)
331 { 322 {
332 if (!m_ids.ContainsKey(agentID)) 323 if (!m_ids.ContainsKey(agentID))
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
index 80f6fce..5590516 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
@@ -25,12 +25,12 @@
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;
29using System.Net; 29using System.Net;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenMetaverse.Packets; 31using OpenMetaverse.Packets;
32using OpenMetaverse.StructuredData; 32using OpenMetaverse.StructuredData;
33 33
34namespace OpenSim.Region.CoreModules.Framework.EventQueue 34namespace OpenSim.Region.CoreModules.Framework.EventQueue
35{ 35{
36 public class EventQueueHelper 36 public class EventQueueHelper
diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
index fe29e0c..11d13b9 100644
--- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
@@ -25,10 +25,10 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Region.Framework.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31 31
32namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander 32namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
33{ 33{
34 /// <summary> 34 /// <summary>
diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
index cd905ab..d98a0f8 100644
--- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
@@ -25,14 +25,14 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Text; 31using System.Text;
32using log4net; 32using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35 35
36namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander 36namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
37{ 37{
38 /// <summary> 38 /// <summary>
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index 13efe6b..095c837 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -26,25 +26,19 @@
26 * 26 *
27 */ 27 */
28 28
29using System; 29using System.Reflection;
30using System.Collections.Generic; 30using log4net;
31using System.Net; 31using Nini.Config;
32using System.Reflection; 32using OpenMetaverse;
33 33using OpenSim.Data;
34using log4net; 34using OpenSim.Framework;
35using Nini.Config; 35using OpenSim.Framework.Communications;
36 36using OpenSim.Framework.Communications.Cache;
37using OpenMetaverse; 37using OpenSim.Framework.Servers;
38 38using OpenSim.Grid.AssetServer;
39using OpenSim.Framework; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Framework.Communications; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Framework.Communications.Cache; 41
42using OpenSim.Framework.Servers;
43using OpenSim.Region.Framework.Interfaces;
44using OpenSim.Region.Framework.Scenes;
45using OpenSim.Grid.AssetServer;
46using OpenSim.Data;
47
48namespace OpenSim.Region.CoreModules.Hypergrid 42namespace OpenSim.Region.CoreModules.Hypergrid
49{ 43{
50 public class HGStandaloneAssetService : IRegionModule 44 public class HGStandaloneAssetService : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
index dfc859e..bf88878 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
@@ -26,20 +26,18 @@
26 * 26 *
27 */ 27 */
28 28
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Reflection;
32using System.Reflection; 32using log4net;
33using log4net; 33using Nini.Config;
34using Nini.Config; 34using OpenMetaverse;
35using OpenMetaverse; 35using OpenSim.Framework;
36using OpenSim.Framework; 36using OpenSim.Framework.Communications;
37using OpenSim.Framework.Communications; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Communications.Cache; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Framework.Servers; 39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Region.Framework.Interfaces; 40
41using OpenSim.Region.Framework.Scenes;
42
43namespace OpenSim.Region.CoreModules.Hypergrid 41namespace OpenSim.Region.CoreModules.Hypergrid
44{ 42{
45 public class HGStandaloneInventoryService : IRegionModule 43 public class HGStandaloneInventoryService : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 5540cc3..6c06fb1 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -27,36 +27,16 @@
27 */ 27 */
28 28
29 29
30using System; 30using System.Collections.Generic;
31using System.Collections; 31using System.Reflection;
32using System.Collections.Generic; 32using log4net;
33using System.Drawing; 33using Nini.Config;
34using System.Drawing.Imaging; 34using OpenMetaverse;
35using System.IO; 35using OpenSim.Framework;
36using System.Net; 36using OpenSim.Region.CoreModules.World.WorldMap;
37using System.Reflection; 37using OpenSim.Region.Framework.Interfaces;
38using System.Threading; 38using OpenSim.Region.Framework.Scenes;
39using OpenMetaverse; 39
40using OpenMetaverse.Imaging;
41using OpenMetaverse.StructuredData;
42using log4net;
43using Nini.Config;
44using Nwc.XmlRpc;
45
46using OpenSim.Framework;
47using OpenSim.Framework.Communications.Cache;
48using OpenSim.Framework.Communications.Capabilities;
49using OpenSim.Framework.Servers;
50using OpenSim.Region.Framework.Interfaces;
51using OpenSim.Region.Framework.Scenes;
52using OpenSim.Region.Framework.Scenes.Types;
53using OpenSim.Region.CoreModules.World.WorldMap;
54using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
55
56using OSD = OpenMetaverse.StructuredData.OSD;
57using OSDMap = OpenMetaverse.StructuredData.OSDMap;
58using OSDArray = OpenMetaverse.StructuredData.OSDArray;
59
60namespace OpenSim.Region.CoreModules.Hypergrid 40namespace OpenSim.Region.CoreModules.Hypergrid
61{ 41{
62 public class HGWorldMapModule : WorldMapModule, IRegionModule 42 public class HGWorldMapModule : WorldMapModule, IRegionModule
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index 2e1675b..42a76bd 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -25,32 +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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net; 31using System.Net;
32using System.Net.Security; 32using System.Net.Security;
33using System.Security.Cryptography.X509Certificates; 33using System.Reflection;
34using System.Reflection; 34using System.Security.Cryptography.X509Certificates;
35using System.Threading; 35using System.Threading;
36using System.Web; 36using System.Web;
37 37using log4net;
38using OpenMetaverse; 38using Nini.Config;
39using OpenMetaverse.StructuredData; 39using OpenMetaverse;
40using OpenMetaverse.Packets; 40using OpenMetaverse.StructuredData;
41 41using OpenSim.Framework;
42using log4net; 42using OpenSim.Framework.Communications.Capabilities;
43using Nini.Config; 43using OpenSim.Region.Framework.Interfaces;
44using OpenSim.Framework; 44using OpenSim.Region.Framework.Scenes;
45using OpenSim.Framework.Communications.Capabilities; 45using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
46using OpenSim.Framework.Servers; 46using OSDArray=OpenMetaverse.StructuredData.OSDArray;
47using OpenSim.Region.Framework.Interfaces; 47using OSDMap=OpenMetaverse.StructuredData.OSDMap;
48using OpenSim.Region.Framework.Scenes; 48
49
50using OSD = OpenMetaverse.StructuredData.OSD;
51using OSDMap = OpenMetaverse.StructuredData.OSDMap;
52using OSDArray = OpenMetaverse.StructuredData.OSDArray;
53
54namespace OpenSim.Region.CoreModules.InterGrid 49namespace OpenSim.Region.CoreModules.InterGrid
55{ 50{
56 public struct OGPState 51 public struct OGPState
@@ -360,7 +355,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
360 355
361 // Using OpenSim.Framework.Communications.Capabilities.Caps here one time.. 356 // Using OpenSim.Framework.Communications.Capabilities.Caps here one time..
362 // so the long name is probably better then a using statement 357 // so the long name is probably better then a using statement
363 public void OnRegisterCaps(UUID agentID, OpenSim.Framework.Communications.Capabilities.Caps caps) 358 public void OnRegisterCaps(UUID agentID, Caps caps)
364 { 359 {
365 /* If we ever want to register our own caps here.... 360 /* If we ever want to register our own caps here....
366 * 361 *
@@ -558,7 +553,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
558 string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/rez"; 553 string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/rez";
559 string derezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/derez"; 554 string derezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/derez";
560 // Get a reference to the user's cap so we can pull out the Caps Object Path 555 // Get a reference to the user's cap so we can pull out the Caps Object Path
561 OpenSim.Framework.Communications.Capabilities.Caps userCap 556 Caps userCap
562 = homeScene.CapsModule.GetCapsHandlerForUser(agentData.AgentID); 557 = homeScene.CapsModule.GetCapsHandlerForUser(agentData.AgentID);
563 558
564 string rezHttpProtocol = "http://"; 559 string rezHttpProtocol = "http://";
@@ -683,7 +678,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
683 if (homeScene != null) 678 if (homeScene != null)
684 { 679 {
685 // Get a referenceokay - to their Cap object so we can pull out the capobjectroot 680 // Get a referenceokay - to their Cap object so we can pull out the capobjectroot
686 OpenSim.Framework.Communications.Capabilities.Caps userCap 681 Caps userCap
687 = homeScene.CapsModule.GetCapsHandlerForUser(userData.AgentID); 682 = homeScene.CapsModule.GetCapsHandlerForUser(userData.AgentID);
688 683
689 //Update the circuit data in the region so this user is authorized 684 //Update the circuit data in the region so this user is authorized
@@ -889,7 +884,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
889 884
890 ShutdownConnection(LocalID,this); 885 ShutdownConnection(LocalID,this);
891 // PLEASE STOP CHANGING THIS TO an M_LOG, M_LOG DOESN'T WORK ON MULTILINE .TOSTRINGS 886 // PLEASE STOP CHANGING THIS TO an M_LOG, M_LOG DOESN'T WORK ON MULTILINE .TOSTRINGS
892 System.Console.WriteLine("RESPONSEDEREZ: " + responseMap.ToString()); 887 Console.WriteLine("RESPONSEDEREZ: " + responseMap.ToString());
893 return responseMap; 888 return responseMap;
894 } 889 }
895 else 890 else
@@ -1202,7 +1197,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
1202 1197
1203 private string CreateRandomStr(int len) 1198 private string CreateRandomStr(int len)
1204 { 1199 {
1205 Random rnd = new Random(System.Environment.TickCount); 1200 Random rnd = new Random(Environment.TickCount);
1206 string returnstring = ""; 1201 string returnstring = "";
1207 string chars = "abcdefghijklmnopqrstuvwxyz0123456789"; 1202 string chars = "abcdefghijklmnopqrstuvwxyz0123456789";
1208 1203
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index e6a12a4..c62930c 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -25,17 +25,17 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.Drawing.Imaging; 31using System.Drawing.Imaging;
32using OpenMetaverse; 32using Nini.Config;
33using OpenMetaverse.Imaging; 33using OpenMetaverse;
34using Nini.Config; 34using OpenMetaverse.Imaging;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture 39namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
40{ 40{
41 public class DynamicTextureModule : IRegionModule, IDynamicTextureManager 41 public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index c23ff1e..2e33d46 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -25,19 +25,18 @@
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;
29using System.Reflection; 29using System.Collections.Generic;
30using System.Collections.Generic; 30using System.Reflection;
31using System.Text.RegularExpressions; 31using System.Text.RegularExpressions;
32using OpenMetaverse; 32using DotNetOpenMail;
33using OpenSim.Framework; 33using DotNetOpenMail.SmtpAuth;
34using OpenSim.Region.Framework.Interfaces; 34using log4net;
35using OpenSim.Region.Framework.Scenes; 35using Nini.Config;
36using log4net; 36using OpenMetaverse;
37using Nini.Config; 37using OpenSim.Region.Framework.Interfaces;
38using DotNetOpenMail; 38using OpenSim.Region.Framework.Scenes;
39using DotNetOpenMail.SmtpAuth; 39
40
41namespace OpenSim.Region.CoreModules.Scripting.EmailModules 40namespace OpenSim.Region.CoreModules.Scripting.EmailModules
42{ 41{
43 public class EmailModule : IEmailModule 42 public class EmailModule : IEmailModule
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 9f3bd09..fdd2664 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -25,20 +25,19 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net; 31using System.Net;
32using System.Text; 32using System.Text;
33using System.Threading; 33using System.Threading;
34using OpenMetaverse; 34using Nini.Config;
35using Nini.Config; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using System.Collections; 40
41
42/***************************************************** 41/*****************************************************
43 * 42 *
44 * ScriptsHttpRequests 43 * ScriptsHttpRequests
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index afcaff1..a3e6543 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -25,16 +25,16 @@
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;
29using System.Drawing; 29using System.Drawing;
30using System.IO; 30using System.IO;
31using System.Net; 31using System.Net;
32using OpenMetaverse; 32using Nini.Config;
33using OpenMetaverse.Imaging; 33using OpenMetaverse;
34using Nini.Config; 34using OpenMetaverse.Imaging;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL 38namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
39{ 39{
40 public class LoadImageURLModule : IRegionModule, IDynamicTextureRender 40 public class LoadImageURLModule : IRegionModule, IDynamicTextureRender
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 0c709b5..c68d8bb 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -25,18 +25,18 @@
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;
29using System.Drawing; 29using System.Drawing;
30using System.Drawing.Imaging; 30using System.Drawing.Imaging;
31using System.Globalization; 31using System.Globalization;
32using System.IO; 32using System.IO;
33using System.Net; 33using System.Net;
34using OpenMetaverse; 34using Nini.Config;
35using OpenMetaverse.Imaging; 35using OpenMetaverse;
36using Nini.Config; 36using OpenMetaverse.Imaging;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39 39
40//using Cairo; 40//using Cairo;
41 41
42namespace OpenSim.Region.CoreModules.Scripting.VectorRender 42namespace OpenSim.Region.CoreModules.Scripting.VectorRender
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index c363940..8e7a49f 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -25,15 +25,15 @@
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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using OpenMetaverse; 31using Nini.Config;
32using Nini.Config; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37// using log4net; 37// using log4net;
38// using System.Reflection; 38// using System.Reflection;
39 39
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index 942c130..6476bcc 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -25,21 +25,20 @@
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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Reflection;
32using System.Reflection; 32using System.Threading;
33using System.Threading; 33using log4net;
34using OpenMetaverse; 34using Nini.Config;
35using log4net; 35using Nwc.XmlRpc;
36using Nini.Config; 36using OpenMetaverse;
37using Nwc.XmlRpc; 37using OpenSim.Framework;
38using OpenSim.Framework; 38using OpenSim.Framework.Servers;
39using OpenSim.Framework.Servers; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Framework.Scenes; 41
42
43/***************************************************** 42/*****************************************************
44 * 43 *
45 * XMLRPCModule 44 * XMLRPCModule
@@ -667,7 +666,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
667 if (resp != null) 666 if (resp != null)
668 { 667 {
669 Hashtable respParms; 668 Hashtable respParms;
670 if (resp.Value.GetType().Equals(typeof(System.Collections.Hashtable))) 669 if (resp.Value.GetType().Equals(typeof(Hashtable)))
671 { 670 {
672 respParms = (Hashtable) resp.Value; 671 respParms = (Hashtable) resp.Value;
673 } 672 }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs
index 179d1a2..bc54eb6 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs
@@ -25,9 +25,9 @@
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.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30 30
31namespace OpenSim.Region.CoreModules.World.Archiver 31namespace OpenSim.Region.CoreModules.World.Archiver
32{ 32{
33 /// <summary> 33 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 0cc1f86..3efb457 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,21 +25,21 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.IO.Compression; 31using System.IO.Compression;
32using System.Reflection; 32using System.Net;
33using System.Xml; 33using System.Reflection;
34using System.Net; 34using System.Text;
35using OpenMetaverse; 35using log4net;
36using log4net; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.CoreModules.World.Terrain;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.CoreModules.World.Terrain; 41using OpenSim.Region.Framework.Scenes;
42 42
43namespace OpenSim.Region.CoreModules.World.Archiver 43namespace OpenSim.Region.CoreModules.World.Archiver
44{ 44{
45 /// <summary> 45 /// <summary>
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
49 { 49 {
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51 51
52 private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); 52 private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
53 53
54 private Scene m_scene; 54 private Scene m_scene;
55 private Stream m_loadStream; 55 private Stream m_loadStream;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index d3c2cd1..c2ed257 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -25,19 +25,18 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Xml;
33using OpenMetaverse; 33using log4net;
34using log4net; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.CoreModules.World.Terrain;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.CoreModules.World.Serialiser; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.CoreModules.World.Terrain; 39
40
41namespace OpenSim.Region.CoreModules.World.Archiver 40namespace OpenSim.Region.CoreModules.World.Archiver
42{ 41{
43 /// <summary> 42 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index ee0ec69..ba4d51b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -25,23 +25,20 @@
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.Framework; 28using System;
29using OpenSim.Framework.Communications.Cache; 29using System.Collections.Generic;
30using OpenSim.Region.Framework.Interfaces; 30using System.IO;
31using OpenSim.Region.Framework.Scenes; 31using System.IO.Compression;
32using OpenSim.Region.CoreModules.World.Serialiser; 32using System.Reflection;
33using OpenSim.Region.CoreModules.World.Terrain; 33using System.Text.RegularExpressions;
34using System; 34using System.Threading;
35using System.Collections.Generic; 35using log4net;
36using System.IO; 36using OpenMetaverse;
37using System.IO.Compression; 37using OpenSim.Framework;
38using System.Reflection; 38using OpenSim.Region.CoreModules.World.Terrain;
39using System.Text.RegularExpressions; 39using OpenSim.Region.Framework.Interfaces;
40using System.Threading; 40using OpenSim.Region.Framework.Scenes;
41using OpenMetaverse; 41
42using log4net;
43using Nini.Config;
44
45namespace OpenSim.Region.CoreModules.World.Archiver 42namespace OpenSim.Region.CoreModules.World.Archiver
46{ 43{
47 /// <summary> 44 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index dd65e83..eeb5acd 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -25,18 +25,13 @@
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.Collections.Generic; 28using System.IO;
29using System.IO; 29using System.Reflection;
30using System.Reflection; 30using log4net;
31using System.Threading; 31using Nini.Config;
32using OpenMetaverse; 32using OpenSim.Region.Framework.Interfaces;
33using log4net; 33using OpenSim.Region.Framework.Scenes;
34using Nini.Config; 34
35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.CoreModules.World.Serialiser;
39
40namespace OpenSim.Region.CoreModules.World.Archiver 35namespace OpenSim.Region.CoreModules.World.Archiver
41{ 36{
42 /// <summary> 37 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index 76d27ce..5488262 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -25,14 +25,14 @@
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.Collections.Generic; 28using System.Collections.Generic;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using System.Xml; 31using System.Xml;
32using OpenMetaverse; 32using log4net;
33using log4net; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35 35
36namespace OpenSim.Region.CoreModules.World.Archiver 36namespace OpenSim.Region.CoreModules.World.Archiver
37{ 37{
38 /// <summary> 38 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index f9909d9..39d2591 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -25,16 +25,16 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Text;
33using OpenMetaverse; 33using System.Xml;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenMetaverse;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework;
37 37
38namespace OpenSim.Region.CoreModules.World.Archiver 38namespace OpenSim.Region.CoreModules.World.Archiver
39{ 39{
40 /// <summary> 40 /// <summary>
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); 47 protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
48 48
49 /// <summary> 49 /// <summary>
50 /// Store for asset data we received before we get the metadata 50 /// Store for asset data we received before we get the metadata
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 8971b6e..659a7ce 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,17 +25,14 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading; 31using System.Threading;
32using OpenMetaverse; 32using log4net;
33using log4net; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 35
36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes;
38
39namespace OpenSim.Region.CoreModules.World.Archiver 36namespace OpenSim.Region.CoreModules.World.Archiver
40{ 37{
41 /// <summary> 38 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
index 3e3e74a..94845cb 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
@@ -25,13 +25,12 @@
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.IO;
29using System.IO; 29using System.Text;
30using System.Text; 30using System.Xml;
31using System.Xml; 31using OpenMetaverse;
32using OpenMetaverse; 32using OpenSim.Framework;
33using OpenSim.Framework; 33
34
35namespace OpenSim.Region.CoreModules.World.Archiver 34namespace OpenSim.Region.CoreModules.World.Archiver
36{ 35{
37 /// <summary> 36 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
index 506d770..983814d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,12 +25,10 @@
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;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Text;
31using System.Text; 31
32using log4net;
33
34namespace OpenSim.Region.CoreModules.World.Archiver 32namespace OpenSim.Region.CoreModules.World.Archiver
35{ 33{
36 /// <summary> 34 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
index 437939e..8e59983 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
@@ -25,13 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Text; 31using System.Text;
32using System.Reflection; 32
33using log4net;
34
35namespace OpenSim.Region.CoreModules.World.Archiver 33namespace OpenSim.Region.CoreModules.World.Archiver
36{ 34{
37 /// <summary> 35 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index f201e74..1ad7e9e 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -25,20 +25,19 @@
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;
29using System.IO; 29using System.IO;
30using System.Threading; 30using System.Threading;
31using NUnit.Framework; 31using log4net.Config;
32using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework;
33using OpenMetaverse; 33using NUnit.Framework.SyntaxHelpers;
34using OpenSim.Framework; 34using OpenMetaverse;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Framework;
36using OpenSim.Region.CoreModules.World.Archiver; 36using OpenSim.Region.CoreModules.World.Serialiser;
37using OpenSim.Region.CoreModules.World.Serialiser; 37using OpenSim.Region.CoreModules.World.Terrain;
38using OpenSim.Region.CoreModules.World.Terrain; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Tests.Common.Setup;
40using OpenSim.Tests.Common.Setup; 40
41
42namespace OpenSim.Region.CoreModules.World.Archiver.Tests 41namespace OpenSim.Region.CoreModules.World.Archiver.Tests
43{ 42{
44 [TestFixture] 43 [TestFixture]
@@ -222,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
222 [Test] 221 [Test]
223 public void TestMergeOarV0p2() 222 public void TestMergeOarV0p2()
224 { 223 {
225 log4net.Config.XmlConfigurator.Configure(); 224 XmlConfigurator.Configure();
226 225
227 MemoryStream archiveWriteStream = new MemoryStream(); 226 MemoryStream archiveWriteStream = new MemoryStream();
228 227
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 8b15308..cc3db3f 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -24,17 +24,19 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System;
28using System.Threading; 28using System.Collections.Generic;
29using System.Collections.Generic; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse; 31using System.Security;
32using log4net; 32using log4net;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenMetaverse;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.CoreModules.World.Terrain;
37 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes;
39
38namespace OpenSim.Region.CoreModules.World.Estate 40namespace OpenSim.Region.CoreModules.World.Estate
39{ 41{
40 public class EstateManagementModule : IEstateModule 42 public class EstateManagementModule : IEstateModule
@@ -458,36 +460,36 @@ namespace OpenSim.Region.CoreModules.World.Estate
458 TerrainUploader = null; 460 TerrainUploader = null;
459 } 461 }
460 remoteClient.SendAlertMessage("Terrain Upload Complete. Loading...."); 462 remoteClient.SendAlertMessage("Terrain Upload Complete. Loading....");
461 OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>(); 463 ITerrainModule terr = m_scene.RequestModuleInterface<ITerrainModule>();
462 464
463 if (terr != null) 465 if (terr != null)
464 { 466 {
465 m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + m_scene.RegionInfo.RegionName); 467 m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + m_scene.RegionInfo.RegionName);
466 if (System.IO.File.Exists(Util.dataDir() + "/terrain.raw")) 468 if (File.Exists(Util.dataDir() + "/terrain.raw"))
467 { 469 {
468 System.IO.File.Delete(Util.dataDir() + "/terrain.raw"); 470 File.Delete(Util.dataDir() + "/terrain.raw");
469 } 471 }
470 try 472 try
471 { 473 {
472 System.IO.FileStream input = new System.IO.FileStream(Util.dataDir() + "/terrain.raw", System.IO.FileMode.CreateNew); 474 FileStream input = new FileStream(Util.dataDir() + "/terrain.raw", FileMode.CreateNew);
473 input.Write(terrainData, 0, terrainData.Length); 475 input.Write(terrainData, 0, terrainData.Length);
474 input.Close(); 476 input.Close();
475 } 477 }
476 catch (System.IO.IOException e) 478 catch (IOException e)
477 { 479 {
478 m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools. It gave us the following error: {0}", e.ToString()); 480 m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools. It gave us the following error: {0}", e.ToString());
479 remoteClient.SendAlertMessage("There was an IO Exception loading your terrain. Please check free space"); 481 remoteClient.SendAlertMessage("There was an IO Exception loading your terrain. Please check free space");
480 482
481 return; 483 return;
482 } 484 }
483 catch (System.Security.SecurityException e) 485 catch (SecurityException e)
484 { 486 {
485 m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools. It gave us the following error: {0}", e.ToString()); 487 m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools. It gave us the following error: {0}", e.ToString());
486 remoteClient.SendAlertMessage("There was a security Exception loading your terrain. Please check the security on the simulator drive"); 488 remoteClient.SendAlertMessage("There was a security Exception loading your terrain. Please check the security on the simulator drive");
487 489
488 return; 490 return;
489 } 491 }
490 catch (System.UnauthorizedAccessException e) 492 catch (UnauthorizedAccessException e)
491 { 493 {
492 m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools. It gave us the following error: {0}", e.ToString()); 494 m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools. It gave us the following error: {0}", e.ToString());
493 remoteClient.SendAlertMessage("There was a security Exception loading your terrain. Please check the security on the simulator drive"); 495 remoteClient.SendAlertMessage("There was a security Exception loading your terrain. Please check the security on the simulator drive");
@@ -544,18 +546,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
544 private void handleTerrainRequest(IClientAPI remote_client, string clientFileName) 546 private void handleTerrainRequest(IClientAPI remote_client, string clientFileName)
545 { 547 {
546 // Save terrain here 548 // Save terrain here
547 OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>(); 549 ITerrainModule terr = m_scene.RequestModuleInterface<ITerrainModule>();
548 550
549 if (terr != null) 551 if (terr != null)
550 { 552 {
551 m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + m_scene.RegionInfo.RegionName); 553 m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + m_scene.RegionInfo.RegionName);
552 if (System.IO.File.Exists(Util.dataDir() + "/terrain.raw")) 554 if (File.Exists(Util.dataDir() + "/terrain.raw"))
553 { 555 {
554 System.IO.File.Delete(Util.dataDir() + "/terrain.raw"); 556 File.Delete(Util.dataDir() + "/terrain.raw");
555 } 557 }
556 terr.SaveToFile(Util.dataDir() + "/terrain.raw"); 558 terr.SaveToFile(Util.dataDir() + "/terrain.raw");
557 559
558 System.IO.FileStream input = new System.IO.FileStream(Util.dataDir() + "/terrain.raw", System.IO.FileMode.Open); 560 FileStream input = new FileStream(Util.dataDir() + "/terrain.raw", FileMode.Open);
559 byte[] bdata = new byte[input.Length]; 561 byte[] bdata = new byte[input.Length];
560 input.Read(bdata, 0, (int)input.Length); 562 input.Read(bdata, 0, (int)input.Length);
561 remote_client.SendAlertMessage("Terrain file written, starting download..."); 563 remote_client.SendAlertMessage("Terrain file written, starting download...");
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
index 94a4072..309a7ae 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
@@ -25,16 +25,10 @@
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;
29using System.IO; 29using OpenMetaverse;
30using System.Reflection; 30using OpenSim.Framework;
31using log4net; 31
32using OpenMetaverse;
33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Framework.Scenes;
36
37
38namespace OpenSim.Region.CoreModules.World.Estate 32namespace OpenSim.Region.CoreModules.World.Estate
39{ 33{
40 34
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 41163a0..98d4076 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,13 +25,12 @@
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; 29using OpenMetaverse;
30using OpenMetaverse; 30using OpenSim.Framework;
31using OpenSim.Framework; 31using OpenSim.Region.Framework.Interfaces;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Region.Framework.Scenes; 33
34
35namespace OpenSim.Region.CoreModules.World.Land 34namespace OpenSim.Region.CoreModules.World.Land
36{ 35{
37 public class LandChannel : ILandChannel 36 public class LandChannel : ILandChannel
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 6ae6576..3ee2267 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,21 +25,21 @@
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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse; 32using log4net;
33using log4net; 33using Nini.Config;
34using Nini.Config; 34using OpenMetaverse;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Framework.Communications.Capabilities;
37using OpenSim.Framework; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Servers; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Framework.Communications.Capabilities; 39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.Physics.Manager;
41using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 41using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
42 42
43namespace OpenSim.Region.CoreModules.World.Land 43namespace OpenSim.Region.CoreModules.World.Land
44{ 44{
45 // used for caching 45 // used for caching
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index fc5bef1..8775a85 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,15 +25,15 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse; 31using log4net;
32using log4net; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37namespace OpenSim.Region.CoreModules.World.Land 37namespace OpenSim.Region.CoreModules.World.Land
38{ 38{
39 /// <summary> 39 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 6e0f8cb..d970579 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -25,20 +25,17 @@
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 OpenMetaverse; 28using System;
29using Nini.Config; 29using System.Collections.Generic;
30using System; 30using System.Reflection;
31using System.Collections; 31using log4net;
32using System.Collections.Generic; 32using Nini.Config;
33using System.Reflection; 33using OpenMetaverse;
34using log4net; 34using OpenSim.Framework;
35using OpenSim; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Framework.Scenes; 38
39using OpenSim.Region.CoreModules.Framework;
40using OpenSim.Framework.Communications.Cache;
41
42namespace OpenSim.Region.CoreModules.World.Permissions 39namespace OpenSim.Region.CoreModules.World.Permissions
43{ 40{
44 public class PermissionsModule : IRegionModule 41 public class PermissionsModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs b/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs
index acc7bb8..ef60dd0 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs
@@ -25,8 +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.Framework.Scenes; 28using OpenSim.Region.Framework.Scenes;
29 29
30namespace OpenSim.Region.CoreModules.World.Serialiser 30namespace OpenSim.Region.CoreModules.World.Serialiser
31{ 31{
32 internal interface IFileSerialiser 32 internal interface IFileSerialiser
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
index ed6448f..76ae9f0 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
@@ -25,13 +25,13 @@
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.Collections.Generic; 28using System.Collections.Generic;
29using System.IO; 29using 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.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
34 34
35namespace OpenSim.Region.CoreModules.World.Serialiser 35namespace OpenSim.Region.CoreModules.World.Serialiser
36{ 36{
37 internal class SerialiseObjects : IFileSerialiser 37 internal class SerialiseObjects : IFileSerialiser
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs
index 924218a..47b8d36 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs
@@ -25,10 +25,10 @@
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.CoreModules.World.Terrain; 28using OpenSim.Region.CoreModules.World.Terrain;
29using OpenSim.Region.CoreModules.World.Terrain.FileLoaders; 29using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.CoreModules.World.Serialiser 32namespace OpenSim.Region.CoreModules.World.Serialiser
33{ 33{
34 internal class SerialiseTerrain : IFileSerialiser 34 internal class SerialiseTerrain : IFileSerialiser
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index 7080d5f..d687e23 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -25,15 +25,15 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using OpenMetaverse; 31using Nini.Config;
32using Nini.Config; 32using OpenMetaverse;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.CoreModules.Framework.InterfaceCommander; 35using OpenSim.Region.Framework.Scenes;
36 36
37namespace OpenSim.Region.CoreModules.World.Serialiser 37namespace OpenSim.Region.CoreModules.World.Serialiser
38{ 38{
39 public class SerialiserModule : IRegionModule, IRegionSerialiserModule 39 public class SerialiserModule : IRegionModule, IRegionSerialiserModule
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index ffd6b8d..c9333c7 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -25,15 +25,13 @@
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;
29using System.Reflection; 29using Nini.Config;
30using Nini.Config; 30using OpenMetaverse;
31using log4net; 31using OpenSim.Framework;
32using OpenMetaverse; 32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Framework; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.Framework.Interfaces; 34
35using OpenSim.Region.Framework.Scenes;
36
37namespace OpenSim.Region.CoreModules.World.Sound 35namespace OpenSim.Region.CoreModules.World.Sound
38{ 36{
39 public class SoundModule : IRegionModule, ISoundModule 37 public class SoundModule : IRegionModule, ISoundModule
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index b36684c..060fda6 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -25,20 +25,22 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using System.Reflection;
31using Nini.Config; 31using log4net;
32using OpenSim.Framework; 32using Nini.Config;
33using OpenSim.Region.Framework.Interfaces; 33using OpenMetaverse;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Framework;
35 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes;
37
36namespace OpenSim.Region.CoreModules 38namespace OpenSim.Region.CoreModules
37{ 39{
38 public class SunModule : IRegionModule 40 public class SunModule : IRegionModule
39 { 41 {
40 42
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 44
43 private const double SeasonalTilt = 0.03 * Math.PI; // A daily shift of approximately 1.7188 degrees 45 private const double SeasonalTilt = 0.03 * Math.PI; // A daily shift of approximately 1.7188 degrees
44 private const double AverageTilt = -0.25 * Math.PI; // A 45 degree tilt 46 private const double AverageTilt = -0.25 * Math.PI; // A 45 degree tilt
@@ -104,7 +106,7 @@ namespace OpenSim.Region.CoreModules
104 private ulong CurrentTime 106 private ulong CurrentTime
105 { 107 {
106 get { 108 get {
107 return (ulong)(((System.DateTime.Now.Ticks) - TicksToEpoch + TicksOffset + LindenHourOffset)/10000000); 109 return (ulong)(((DateTime.Now.Ticks) - TicksToEpoch + TicksOffset + LindenHourOffset)/10000000);
108 } 110 }
109 } 111 }
110 112
@@ -161,7 +163,7 @@ namespace OpenSim.Region.CoreModules
161 163
162 // Align ticks with Second Life 164 // Align ticks with Second Life
163 165
164 TicksToEpoch = new System.DateTime(1970,1,1).Ticks; 166 TicksToEpoch = new DateTime(1970,1,1).Ticks;
165 167
166 // Just in case they don't have the stanzas 168 // Just in case they don't have the stanzas
167 try 169 try
diff --git a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs b/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
index f96ab88..cf38bca 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
@@ -25,11 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.CoreModules.World.Terrain;
30using OpenSim.Region.CoreModules.World.Terrain; 30using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
31using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects 33namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects
34{ 34{
35 public class ChannelDigger : ITerrainEffect 35 public class ChannelDigger : ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
index cb8112c..20c25d3 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -24,11 +24,11 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System;
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
29using OpenSim.Region.Framework.Scenes; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.CoreModules.World.Terrain.Effects 32namespace OpenSim.Region.CoreModules.World.Terrain.Effects
33{ 33{
34 internal class CookieCutter : ITerrainEffect 34 internal class CookieCutter : ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
index da6ee12..e21466c 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -24,10 +24,10 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using OpenSim.Framework; 27using OpenSim.Framework;
28using OpenSim.Region.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Scenes; 29using OpenSim.Region.Framework.Scenes;
30 30
31namespace OpenSim.Region.CoreModules.World.Terrain.Effects 31namespace OpenSim.Region.CoreModules.World.Terrain.Effects
32{ 32{
33 internal class DefaultTerrainGenerator : ITerrainEffect 33 internal class DefaultTerrainGenerator : ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
index 4f395b5..630d5a0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,11 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Drawing; 28using System.Drawing;
29using System.Drawing.Imaging; 29using System.Drawing.Imaging;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders 33namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
34{ 34{
35 /// <summary> 35 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
index cff82d1..704386f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,11 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Drawing; 28using System.Drawing;
29using System.Drawing.Imaging; 29using System.Drawing.Imaging;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders 33namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
34{ 34{
35 internal class GIF : GenericSystemDrawing 35 internal class GIF : GenericSystemDrawing
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 477c73c..f4d1c76 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,13 +25,13 @@
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;
29using System.Drawing; 29using System.Drawing;
30using System.Drawing.Imaging; 30using System.Drawing.Imaging;
31using System.IO; 31using System.IO;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
34 34
35namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders 35namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
36{ 36{
37 /// <summary> 37 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
index f8e31f8..44afed1 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
@@ -25,12 +25,12 @@
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;
29using System.Drawing; 29using System.Drawing;
30using System.Drawing.Imaging; 30using System.Drawing.Imaging;
31using System.IO; 31using System.IO;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33 33
34namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders 34namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
35{ 35{
36 public class JPEG : ITerrainLoader 36 public class JPEG : ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
index a86ae00..7dbcc50 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
@@ -25,11 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using OpenSim.Region.Framework.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Framework.Scenes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders 33namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
34{ 34{
35 public class LLRAW : ITerrainLoader 35 public class LLRAW : ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
index 0dea282..5a00525 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,11 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Drawing; 28using System.Drawing;
29using System.Drawing.Imaging; 29using System.Drawing.Imaging;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders 33namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
34{ 34{
35 internal class PNG : GenericSystemDrawing 35 internal class PNG : GenericSystemDrawing
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
index 178104f..d54f529 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
@@ -25,10 +25,10 @@
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.IO; 28using System.IO;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders 32namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
33{ 33{
34 public class RAW32 : ITerrainLoader 34 public class RAW32 : ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
index 220431f..3233ab6 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -25,11 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Drawing; 28using System.Drawing;
29using System.Drawing.Imaging; 29using System.Drawing.Imaging;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders 33namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
34{ 34{
35 internal class TIFF : GenericSystemDrawing 35 internal class TIFF : GenericSystemDrawing
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
index 426708d..82108da 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
@@ -25,12 +25,12 @@
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;
29using System.IO; 29using System.IO;
30using System.Text; 30using System.Text;
31using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32using OpenSim.Region.Framework.Scenes; 32using OpenSim.Region.Framework.Scenes;
33 33
34namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders 34namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
35{ 35{
36 /// <summary> 36 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
index fe79c0b..feef3df 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
@@ -25,8 +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.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes 30namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
31{ 31{
32 public class FlattenArea : ITerrainFloodEffect 32 public class FlattenArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
index 5c0aace..f91ddf2 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
@@ -25,8 +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.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes 30namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
31{ 31{
32 public class LowerArea : ITerrainFloodEffect 32 public class LowerArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
index 02f2b53..599951d 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
@@ -25,10 +25,10 @@
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.Framework; 28using OpenSim.Framework;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes 32namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
33{ 33{
34 public class NoiseArea : ITerrainFloodEffect 34 public class NoiseArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
index 768b31f..4eaae4b 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
@@ -25,8 +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.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes 30namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
31{ 31{
32 public class RaiseArea : ITerrainFloodEffect 32 public class RaiseArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
index 66b9055..2c31ca9 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
@@ -25,8 +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.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes 30namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
31{ 31{
32 public class RevertArea : ITerrainFloodEffect 32 public class RevertArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
index a75dde1..3c44fb0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
@@ -25,8 +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.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes 30namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
31{ 31{
32 public class SmoothArea : ITerrainFloodEffect 32 public class SmoothArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
index 40b9f5a..b6edde1 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
@@ -25,8 +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.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.CoreModules.World.Terrain 30namespace OpenSim.Region.CoreModules.World.Terrain
31{ 31{
32 public interface ITerrainEffect 32 public interface ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
index eee7a83..41f31f8 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
@@ -25,9 +25,9 @@
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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30 30
31namespace OpenSim.Region.CoreModules.World.Terrain 31namespace OpenSim.Region.CoreModules.World.Terrain
32{ 32{
33 public interface ITerrainFloodEffect 33 public interface ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
index c62b897..4cee9f5 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
@@ -25,9 +25,9 @@
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.IO; 28using System.IO;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30 30
31namespace OpenSim.Region.CoreModules.World.Terrain 31namespace OpenSim.Region.CoreModules.World.Terrain
32{ 32{
33 public interface ITerrainLoader 33 public interface ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
index 8c5d1d9..807a4a7 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
@@ -26,10 +26,9 @@
26 */ 26 */
27 27
28 28
29using System.IO; 29using System.IO;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31
32
33namespace OpenSim.Region.CoreModules.World.Terrain 32namespace OpenSim.Region.CoreModules.World.Terrain
34{ 33{
35 public interface ITerrainModule 34 public interface ITerrainModule
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
index 15d9f6e..8e4ffe0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
@@ -25,8 +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.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29 29
30namespace OpenSim.Region.CoreModules.World.Terrain 30namespace OpenSim.Region.CoreModules.World.Terrain
31{ 31{
32 public interface ITerrainPaintableEffect 32 public interface ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
index 6ce6994..10d015f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
@@ -25,10 +25,10 @@
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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes 32namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
33{ 33{
34 /// <summary> 34 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
index 928a595..d6a3b8e 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -25,10 +25,10 @@
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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes 32namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
33{ 33{
34 public class FlattenSphere : ITerrainPaintableEffect 34 public class FlattenSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
index 8c40088..407fd89 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
@@ -25,9 +25,9 @@
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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30 30
31namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes 31namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
32{ 32{
33 public class LowerSphere : ITerrainPaintableEffect 33 public class LowerSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
index 95a8c33..34f5d94 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
@@ -25,11 +25,10 @@
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 OpenSim.Framework;
29using OpenSim.Framework; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Interfaces; 30using OpenSim.Region.Framework.Scenes;
31using OpenSim.Region.Framework.Scenes; 31
32
33namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes 32namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
34{ 33{
35 public class NoiseSphere : ITerrainPaintableEffect 34 public class NoiseSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
index 1a2528a..1207723 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
@@ -25,10 +25,10 @@
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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes 32namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
33{ 33{
34 /// <summary> 34 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
index c53bb7d..7df751f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
@@ -25,10 +25,9 @@
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;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30
31
32namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes 31namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
33{ 32{
34 public class RaiseSphere : ITerrainPaintableEffect 33 public class RaiseSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
index 4ed8a13..b156565 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
@@ -25,10 +25,9 @@
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 OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Scenes;
30using OpenSim.Region.Framework.Scenes; 30
31
32namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes 31namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
33{ 32{
34 public class RevertSphere : ITerrainPaintableEffect 33 public class RevertSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 6636d8f..346e5de 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -25,9 +25,9 @@
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.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Scenes; 29using OpenSim.Region.Framework.Scenes;
30 30
31namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes 31namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
32{ 32{
33 public class SmoothSphere : ITerrainPaintableEffect 33 public class SmoothSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
index 6b00cc8..33970be 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
@@ -25,9 +25,9 @@
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.Framework.Interfaces; 28using OpenSim.Region.Framework.Interfaces;
29using OpenSim.Region.Framework.Scenes; 29using OpenSim.Region.Framework.Scenes;
30 30
31namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes 31namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
32{ 32{
33 /// <summary> 33 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs
index ff9b8ec..1769dc0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs
@@ -25,8 +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 System; 28using System;
29 29
30namespace OpenSim.Region.CoreModules.World.Terrain 30namespace OpenSim.Region.CoreModules.World.Terrain
31{ 31{
32 public class TerrainException : Exception 32 public class TerrainException : Exception
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 9de7338..8aa8ecc 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -25,21 +25,21 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse; 32using log4net;
33using log4net; 33using Nini.Config;
34using Nini.Config; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
38using OpenSim.Region.CoreModules.Framework.InterfaceCommander; 38using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
39using OpenSim.Region.CoreModules.World.Terrain.FileLoaders; 39using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
40using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes; 41using OpenSim.Region.Framework.Scenes;
42 42
43namespace OpenSim.Region.CoreModules.World.Terrain 43namespace OpenSim.Region.CoreModules.World.Terrain
44{ 44{
45 public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule 45 public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
index e7f92d7..eea4ed4 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
@@ -25,11 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
31using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.CoreModules.World.Terrain.Tests 33namespace OpenSim.Region.CoreModules.World.Terrain.Tests
34{ 34{
35 [TestFixture] 35 [TestFixture]
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index 8b2bb1e..e9d1dc3 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -25,17 +25,15 @@
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;
29using System.Reflection; 29using System.Reflection;
30using log4net; 30using log4net;
31using Nini.Config; 31using Nini.Config;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Framework.Interfaces; 36
37using OpenSim.Region.Framework.Scenes;
38
39namespace OpenSim.Region.CoreModules.Avatar.Vegetation 37namespace OpenSim.Region.CoreModules.Avatar.Vegetation
40{ 38{
41 public class VegetationModule : IRegionModule, IVegetationModule 39 public class VegetationModule : IRegionModule, IVegetationModule
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index b8bd605..ebc7e00 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -25,14 +25,14 @@
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using Nini.Config;
31using Nini.Config; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.CoreModules 36namespace OpenSim.Region.CoreModules
37{ 37{
38 public class WindModule : IWindModule 38 public class WindModule : IWindModule
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules
42 42
43 private int m_frame = 0; 43 private int m_frame = 0;
44 private int m_frame_mod = 150; 44 private int m_frame_mod = 150;
45 private Random rndnums = new Random(System.Environment.TickCount); 45 private Random rndnums = new Random(Environment.TickCount);
46 private Scene m_scene = null; 46 private Scene m_scene = null;
47 private bool ready = false; 47 private bool ready = false;
48 private Vector2[] windSpeeds = new Vector2[16 * 16]; 48 private Vector2[] windSpeeds = new Vector2[16 * 16];
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs
index 3684df0..eaf43d3 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs
@@ -25,10 +25,10 @@
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.Drawing; 28using System.Drawing;
29using OpenSim.Region.Framework.Scenes; 29using Nini.Config;
30using Nini.Config; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.CoreModules.World.WorldMap 32namespace OpenSim.Region.CoreModules.World.WorldMap
33{ 33{
34 public interface IMapTileTerrainRenderer 34 public interface IMapTileTerrainRenderer
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
index eea6cf6..188915d 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
@@ -25,20 +25,17 @@
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;
29using System.Collections; 29using System.Collections.Generic;
30using System.Collections.Generic; 30using System.Drawing;
31using System.Drawing; 31using System.Reflection;
32using System.Drawing.Drawing2D; 32using log4net;
33using System.Drawing.Imaging; 33using Nini.Config;
34using System.Reflection; 34using OpenMetaverse;
35using Nini.Config; 35using OpenMetaverse.Imaging;
36using OpenMetaverse.Imaging; 36using OpenSim.Region.Framework.Interfaces;
37using log4net; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Framework.Interfaces; 38
39using OpenSim.Region.Framework.Scenes;
40using OpenMetaverse;
41
42namespace OpenSim.Region.CoreModules.World.WorldMap 39namespace OpenSim.Region.CoreModules.World.WorldMap
43{ 40{
44 public enum DrawRoutine 41 public enum DrawRoutine
@@ -208,7 +205,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
208 { 205 {
209 int tc = 0; 206 int tc = 0;
210 double[,] hm = whichScene.Heightmap.GetDoubles(); 207 double[,] hm = whichScene.Heightmap.GetDoubles();
211 tc = System.Environment.TickCount; 208 tc = Environment.TickCount;
212 m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile"); 209 m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile");
213 List<EntityBase> objs = whichScene.GetEntities(); 210 List<EntityBase> objs = whichScene.GetEntities();
214 Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>(); 211 Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>();
@@ -525,7 +522,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
525 g.Dispose(); 522 g.Dispose();
526 } // lock entities objs 523 } // lock entities objs
527 524
528 m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (System.Environment.TickCount - tc) + " ms"); 525 m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms");
529 return mapbmp; 526 return mapbmp;
530 } 527 }
531 528
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 45a99a9..bd7e140 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -24,18 +24,16 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System.Collections.Generic;
28using System.Reflection; 28using System.Reflection;
29using System.Collections.Generic; 29using log4net;
30using System.Net; 30using Nini.Config;
31using OpenSim.Framework; 31using OpenMetaverse;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Framework;
33using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes.Hypergrid; 34using OpenSim.Region.Framework.Scenes;
35using OpenMetaverse; 35using OpenSim.Region.Framework.Scenes.Hypergrid;
36using log4net; 36
37using Nini.Config;
38
39namespace OpenSim.Region.CoreModules.World.WorldMap 37namespace OpenSim.Region.CoreModules.World.WorldMap
40{ 38{
41 public class MapSearchModule : IRegionModule 39 public class MapSearchModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs
index b783d7c..501c826 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs
@@ -25,20 +25,13 @@
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;
29using System.Collections; 29using System.Drawing;
30using System.Collections.Generic; 30using System.Reflection;
31using System.Drawing; 31using log4net;
32using System.Drawing.Drawing2D; 32using Nini.Config;
33using System.Drawing.Imaging; 33using OpenSim.Region.Framework.Scenes;
34using System.Reflection; 34
35using OpenMetaverse;
36using OpenMetaverse.Imaging;
37using Nini.Config;
38using log4net;
39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes;
41
42namespace OpenSim.Region.CoreModules.World.WorldMap 35namespace OpenSim.Region.CoreModules.World.WorldMap
43{ 36{
44 public class ShadedMapTileRenderer : IMapTileTerrainRenderer 37 public class ShadedMapTileRenderer : IMapTileTerrainRenderer
@@ -57,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
57 50
58 public void TerrainToBitmap(Bitmap mapbmp) 51 public void TerrainToBitmap(Bitmap mapbmp)
59 { 52 {
60 int tc = System.Environment.TickCount; 53 int tc = Environment.TickCount;
61 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain"); 54 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain");
62 55
63 double[,] hm = m_scene.Heightmap.GetDoubles(); 56 double[,] hm = m_scene.Heightmap.GetDoubles();
@@ -151,7 +144,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
151 hfdiffihighlight = hfdiffihighlight + Math.Abs((int)(((hfdiff * highlightfactor) % 1f) * 5f) - 1); 144 hfdiffihighlight = hfdiffihighlight + Math.Abs((int)(((hfdiff * highlightfactor) % 1f) * 5f) - 1);
152 } 145 }
153 } 146 }
154 catch (System.OverflowException) 147 catch (OverflowException)
155 { 148 {
156 m_log.Debug("[MAPTILE]: Shadow failed at value: " + hfdiff.ToString()); 149 m_log.Debug("[MAPTILE]: Shadow failed at value: " + hfdiff.ToString());
157 ShadowDebugContinue = false; 150 ShadowDebugContinue = false;
@@ -199,7 +192,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
199 } 192 }
200 } 193 }
201 } 194 }
202 catch (System.ArgumentException) 195 catch (ArgumentException)
203 { 196 {
204 if (!terraincorruptedwarningsaid) 197 if (!terraincorruptedwarningsaid)
205 { 198 {
@@ -230,7 +223,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
230 Color water = Color.FromArgb((int)heightvalue, (int)heightvalue, 255); 223 Color water = Color.FromArgb((int)heightvalue, (int)heightvalue, 255);
231 mapbmp.SetPixel(x, yr, water); 224 mapbmp.SetPixel(x, yr, water);
232 } 225 }
233 catch (System.ArgumentException) 226 catch (ArgumentException)
234 { 227 {
235 if (!terraincorruptedwarningsaid) 228 if (!terraincorruptedwarningsaid)
236 { 229 {
@@ -243,7 +236,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
243 } 236 }
244 } 237 }
245 } 238 }
246 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms"); 239 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
247 } 240 }
248 } 241 }
249} 242}
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
index 537644a..dc59d9e 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
@@ -25,22 +25,17 @@
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;
29using System.Collections; 29using System.Collections.Generic;
30using System.Collections.Generic; 30using System.Drawing;
31using System.Drawing; 31using System.Reflection;
32using System.Drawing.Drawing2D; 32using log4net;
33using System.Drawing.Imaging; 33using Nini.Config;
34using System.Reflection; 34using OpenMetaverse;
35using OpenMetaverse; 35using OpenMetaverse.Imaging;
36using Nini.Config; 36using OpenSim.Framework;
37using log4net; 37using OpenSim.Region.Framework.Scenes;
38using OpenMetaverse.Imaging; 38
39using OpenSim.Framework;
40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.CoreModules.World.Terrain;
43
44namespace OpenSim.Region.CoreModules.World.WorldMap 39namespace OpenSim.Region.CoreModules.World.WorldMap
45{ 40{
46 // Hue, Saturation, Value; used for color-interpolation 41 // Hue, Saturation, Value; used for color-interpolation
@@ -269,7 +264,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
269 264
270 public void TerrainToBitmap(Bitmap mapbmp) 265 public void TerrainToBitmap(Bitmap mapbmp)
271 { 266 {
272 int tc = System.Environment.TickCount; 267 int tc = Environment.TickCount;
273 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain"); 268 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain");
274 269
275 // These textures should be in the AssetCache anyway, as every client conneting to this 270 // These textures should be in the AssetCache anyway, as every client conneting to this
@@ -405,7 +400,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
405 } 400 }
406 } 401 }
407 } 402 }
408 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms"); 403 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
409 } 404 }
410 } 405 }
411} 406}
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 376e365..b372988 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -25,33 +25,29 @@
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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Drawing; 31using System.Drawing;
32using System.Drawing.Imaging; 32using System.Drawing.Imaging;
33using System.IO; 33using System.IO;
34using System.Net; 34using System.Net;
35using System.Reflection; 35using System.Reflection;
36using System.Threading; 36using System.Threading;
37using OpenMetaverse; 37using log4net;
38using OpenMetaverse.Imaging; 38using Nini.Config;
39using OpenMetaverse.StructuredData; 39using OpenMetaverse;
40using log4net; 40using OpenMetaverse.Imaging;
41using Nini.Config; 41using OpenMetaverse.StructuredData;
42using OpenSim.Framework; 42using OpenSim.Framework;
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.Framework.Interfaces;
46using OpenSim.Region.Framework.Interfaces; 46using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Framework.Scenes; 47using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
48using OpenSim.Region.Framework.Scenes.Types; 48using OSDArray=OpenMetaverse.StructuredData.OSDArray;
49using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 49using OSDMap=OpenMetaverse.StructuredData.OSDMap;
50 50
51using OSD = OpenMetaverse.StructuredData.OSD;
52using OSDMap = OpenMetaverse.StructuredData.OSDMap;
53using OSDArray = OpenMetaverse.StructuredData.OSDArray;
54
55namespace OpenSim.Region.CoreModules.World.WorldMap 51namespace OpenSim.Region.CoreModules.World.WorldMap
56{ 52{
57 public class WorldMapModule : IRegionModule 53 public class WorldMapModule : IRegionModule
@@ -329,7 +325,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
329 { 325 {
330 // Local Map Item Request 326 // Local Map Item Request
331 List<ScenePresence> avatars = m_scene.GetAvatars(); 327 List<ScenePresence> avatars = m_scene.GetAvatars();
332 int tc = System.Environment.TickCount; 328 int tc = Environment.TickCount;
333 List<mapItemReply> mapitems = new List<mapItemReply>(); 329 List<mapItemReply> mapitems = new List<mapItemReply>();
334 mapItemReply mapitem = new mapItemReply(); 330 mapItemReply mapitem = new mapItemReply();
335 if (avatars.Count == 0 || avatars.Count == 1) 331 if (avatars.Count == 0 || avatars.Count == 1)
@@ -554,7 +550,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
554 lock (m_blacklistedregions) 550 lock (m_blacklistedregions)
555 { 551 {
556 if (!m_blacklistedregions.ContainsKey(regionhandle)) 552 if (!m_blacklistedregions.ContainsKey(regionhandle))
557 m_blacklistedregions.Add(regionhandle, System.Environment.TickCount); 553 m_blacklistedregions.Add(regionhandle, Environment.TickCount);
558 } 554 }
559 m_log.InfoFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString()); 555 m_log.InfoFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString());
560 } 556 }
@@ -610,7 +606,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
610 lock (m_blacklistedurls) 606 lock (m_blacklistedurls)
611 { 607 {
612 if (!m_blacklistedurls.ContainsKey(httpserver)) 608 if (!m_blacklistedurls.ContainsKey(httpserver))
613 m_blacklistedurls.Add(httpserver, System.Environment.TickCount); 609 m_blacklistedurls.Add(httpserver, Environment.TickCount);
614 } 610 }
615 611
616 m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver); 612 m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
@@ -639,7 +635,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
639 lock (m_blacklistedurls) 635 lock (m_blacklistedurls)
640 { 636 {
641 if (!m_blacklistedurls.ContainsKey(httpserver)) 637 if (!m_blacklistedurls.ContainsKey(httpserver))
642 m_blacklistedurls.Add(httpserver, System.Environment.TickCount); 638 m_blacklistedurls.Add(httpserver, Environment.TickCount);
643 } 639 }
644 640
645 m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver); 641 m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
@@ -804,7 +800,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
804 List<ScenePresence> avatars = m_scene.GetAvatars(); 800 List<ScenePresence> avatars = m_scene.GetAvatars();
805 OSDArray responsearr = new OSDArray(avatars.Count); 801 OSDArray responsearr = new OSDArray(avatars.Count);
806 OSDMap responsemapdata = new OSDMap(); 802 OSDMap responsemapdata = new OSDMap();
807 int tc = System.Environment.TickCount; 803 int tc = Environment.TickCount;
808 /* 804 /*
809 foreach (ScenePresence av in avatars) 805 foreach (ScenePresence av in avatars)
810 { 806 {
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 9af8914..82b3826 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -26,16 +26,15 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections; 29using System.Collections;
31using System.Reflection; 30using System.Reflection;
32using System.Xml; 31using System.Xml;
33using log4net; 32using log4net;
34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Framework.Communications.Capabilities;
36using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
37using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework.Communications.Capabilities;
38using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using OpenSim.Region.Framework.Scenes;
37using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
39 38
40namespace OpenSim.Region.DataSnapshot 39namespace OpenSim.Region.DataSnapshot
41{ 40{
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 735e14b..3013971 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -31,17 +31,15 @@ using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Net; 32using System.Net;
33using System.Reflection; 33using System.Reflection;
34using System.Text;
35using System.Xml; 34using System.Xml;
36using OpenMetaverse;
37using log4net; 35using log4net;
38using Nini.Config; 36using Nini.Config;
37using OpenMetaverse;
39using OpenSim.Framework; 38using OpenSim.Framework;
40using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
41using OpenSim.Region.DataSnapshot.Interfaces; 40using OpenSim.Region.DataSnapshot.Interfaces;
42using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes; 42using OpenSim.Region.Framework.Scenes;
44using OpenMetaverse.Packets;
45 43
46namespace OpenSim.Region.DataSnapshot 44namespace OpenSim.Region.DataSnapshot
47{ 45{
@@ -51,7 +49,7 @@ namespace OpenSim.Region.DataSnapshot
51 //Information from config 49 //Information from config
52 private bool m_enabled = false; 50 private bool m_enabled = false;
53 private bool m_configLoaded = false; 51 private bool m_configLoaded = false;
54 private List<String> m_disabledModules = new List<String>(); 52 private List<string> m_disabledModules = new List<string>();
55 private Dictionary<string, string> m_gridinfo = new Dictionary<string, string>(); 53 private Dictionary<string, string> m_gridinfo = new Dictionary<string, string>();
56 private string m_snapsDir = "DataSnapshot"; 54 private string m_snapsDir = "DataSnapshot";
57 private string m_exposure_level = "minimum"; 55 private string m_exposure_level = "minimum";
@@ -123,7 +121,7 @@ namespace OpenSim.Region.DataSnapshot
123 { 121 {
124 m_disabledModules.Add(bloody_wanker); 122 m_disabledModules.Add(bloody_wanker);
125 } 123 }
126 m_lastUpdate = System.Environment.TickCount; 124 m_lastUpdate = Environment.TickCount;
127 } 125 }
128 catch (Exception) 126 catch (Exception)
129 { 127 {
@@ -363,26 +361,26 @@ namespace OpenSim.Region.DataSnapshot
363 private void CheckStale() 361 private void CheckStale()
364 { 362 {
365 // Wrap check 363 // Wrap check
366 if (System.Environment.TickCount < m_lastUpdate) 364 if (Environment.TickCount < m_lastUpdate)
367 { 365 {
368 m_lastUpdate = System.Environment.TickCount; 366 m_lastUpdate = Environment.TickCount;
369 } 367 }
370 368
371 if (m_stales >= m_maxStales) 369 if (m_stales >= m_maxStales)
372 { 370 {
373 if (System.Environment.TickCount - m_lastUpdate >= 20000) 371 if (Environment.TickCount - m_lastUpdate >= 20000)
374 { 372 {
375 m_stales = 0; 373 m_stales = 0;
376 m_lastUpdate = System.Environment.TickCount; 374 m_lastUpdate = Environment.TickCount;
377 MakeEverythingStale(); 375 MakeEverythingStale();
378 } 376 }
379 } 377 }
380 else 378 else
381 { 379 {
382 if (m_lastUpdate + 1000 * m_period < System.Environment.TickCount) 380 if (m_lastUpdate + 1000 * m_period < Environment.TickCount)
383 { 381 {
384 m_stales = 0; 382 m_stales = 0;
385 m_lastUpdate = System.Environment.TickCount; 383 m_lastUpdate = Environment.TickCount;
386 MakeEverythingStale(); 384 MakeEverythingStale();
387 } 385 }
388 } 386 }
diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
index e805e5b..36f93a3 100644
--- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
@@ -25,9 +25,6 @@
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;
29using System.Collections.Generic;
30using System.Text;
31using System.Xml; 28using System.Xml;
32 29
33namespace OpenSim.Region.DataSnapshot.Interfaces 30namespace OpenSim.Region.DataSnapshot.Interfaces
diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
index 73e41ee..6c66922 100644
--- a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
+++ b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
@@ -25,7 +25,6 @@
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;
29using OpenSim.Framework.Communications.Capabilities; 28using OpenSim.Framework.Communications.Capabilities;
30 29
31namespace OpenSim.Region.DataSnapshot 30namespace OpenSim.Region.DataSnapshot
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 52659e4..fea9f9b 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -29,15 +29,14 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Xml; 31using System.Xml;
32using OpenMetaverse;
33using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.CoreModules.World.Land;
35using OpenSim.Region.DataSnapshot.Interfaces; 37using OpenSim.Region.DataSnapshot.Interfaces;
36using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.CoreModules.World.Land;
38using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
39using OpenMetaverse.Packets;
40using OpenSim.Framework.Communications.Cache;
41 40
42namespace OpenSim.Region.DataSnapshot.Providers 41namespace OpenSim.Region.DataSnapshot.Providers
43{ 42{
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 949cc38..7cca6ad 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -30,12 +30,11 @@ using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Xml; 31using System.Xml;
32using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework;
33using OpenSim.Region.DataSnapshot.Interfaces; 35using OpenSim.Region.DataSnapshot.Interfaces;
34using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.CoreModules.World.Land;
37using OpenSim.Framework;
38using OpenMetaverse;
39 38
40namespace OpenSim.Region.DataSnapshot.Providers 39namespace OpenSim.Region.DataSnapshot.Providers
41{ 40{
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index 22fe067..9886995 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -27,12 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
31using System.Reflection;
30using System.Text; 32using System.Text;
31using System.Xml; 33using System.Xml;
32using System.IO; 34using log4net;
33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.DataSnapshot.Interfaces; 35using OpenSim.Region.DataSnapshot.Interfaces;
35using OpenMetaverse; 36using OpenSim.Region.Framework.Scenes;
36 37
37namespace OpenSim.Region.DataSnapshot 38namespace OpenSim.Region.DataSnapshot
38{ 39{
@@ -42,7 +43,7 @@ namespace OpenSim.Region.DataSnapshot
42 private String m_directory = "unyuu"; //not an attempt at adding RM references to core SVN, honest 43 private String m_directory = "unyuu"; //not an attempt at adding RM references to core SVN, honest
43 private Dictionary<Scene, bool> m_scenes = null; 44 private Dictionary<Scene, bool> m_scenes = null;
44 private List<IDataSnapshotProvider> m_providers = null; 45 private List<IDataSnapshotProvider> m_providers = null;
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 private Dictionary<String, String> m_gridinfo = null; 47 private Dictionary<String, String> m_gridinfo = null;
47 private bool m_cacheEnabled = true; 48 private bool m_cacheEnabled = true;
48 private string m_listener_port = "9000"; //TODO: Set default port over 9000 49 private string m_listener_port = "9000"; //TODO: Set default port over 9000
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
index 6c9cf2c..90269cf 100644
--- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
+++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
@@ -26,9 +26,8 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.IO;
30using OpenMetaverse;
31using Nini.Config; 29using Nini.Config;
30using OpenMetaverse;
32using OpenSim.Framework; 31using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
index 49a5dd0..b41ba9e 100644
--- a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
@@ -27,7 +27,6 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
32 31
33namespace OpenSim.Region.Framework.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
index b533206..d39fff9 100644
--- a/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
@@ -27,7 +27,6 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Region.Framework.Interfaces;
31 30
32namespace OpenSim.Region.Framework.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
33{ 32{
diff --git a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
index bac0b2e..ddc62d2 100644
--- a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
@@ -25,11 +25,10 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using OpenMetaverse; 29using OpenMetaverse;
31using OpenSim.Framework; 30using OpenSim.Framework;
32using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 31using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
33 32
34namespace OpenSim.Region.Framework.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
35{ 34{
diff --git a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
index 7247d52..d6f3340 100644
--- a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
@@ -25,7 +25,6 @@
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;
29using OpenMetaverse; 28using OpenMetaverse;
30using OpenSim.Framework; 29using OpenSim.Framework;
31 30
diff --git a/OpenSim/Region/Framework/Interfaces/IEmailModule.cs b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
index b5f885a..f06fbc8 100644
--- a/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
@@ -25,8 +25,6 @@
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;
29using OpenSim.Framework;
30using OpenMetaverse; 28using OpenMetaverse;
31 29
32namespace OpenSim.Region.Framework.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 20fe090..69b2bad 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -25,15 +25,9 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Reflection;
31using OpenMetaverse; 29using OpenMetaverse;
32using log4net;
33using OpenSim.Framework; 30using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes.Scripting;
37 31
38namespace OpenSim.Region.Framework.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
39{ 33{
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
index 4da115e..faa9002 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
@@ -25,9 +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 System;
29using OpenSim.Framework;
30using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework;
31 30
32namespace OpenSim.Region.Framework.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
33{ 32{
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index f169f61..59f68ef 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -25,8 +25,6 @@
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;
29using OpenSim.Framework;
30using OpenMetaverse; 28using OpenMetaverse;
31 29
32namespace OpenSim.Region.Framework.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index cf609ae..b8874e3 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -25,14 +25,10 @@
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;
29using System.Net; 28using System.Net;
30using OpenSim.Framework;
31using OpenMetaverse; 29using OpenMetaverse;
32using OpenMetaverse.Packets; 30using OpenMetaverse.Packets;
33using OpenMetaverse.StructuredData; 31using OpenMetaverse.StructuredData;
34using System.Collections.Generic;
35using System.Text;
36 32
37namespace OpenSim.Region.Framework.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
38{ 34{
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
index 16527d1..67c88dd 100644
--- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
@@ -25,10 +25,9 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using OpenSim.Framework;
31using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework;
32 31
33namespace OpenSim.Region.Framework.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
34{ 33{
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
index fd49757..e552270 100644
--- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
@@ -25,9 +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 System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Net;
31using OpenMetaverse; 29using OpenMetaverse;
32 30
33namespace OpenSim.Region.Framework.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
index bfa17fc..06ef1aa 100644
--- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
@@ -25,9 +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 System;
29using OpenSim.Framework;
30using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework;
31 30
32namespace OpenSim.Region.Framework.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
33{ 32{
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
index 0e1e851..f68807a 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
@@ -25,8 +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 System.IO; 28using System.IO;
29 29
30namespace OpenSim.Region.Framework.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
31{ 31{
32 public interface IInventoryArchiverModule 32 public interface IInventoryArchiverModule
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
index 4314271..716d7a8 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
@@ -25,7 +25,6 @@
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.Collections.Generic;
29using OpenMetaverse; 28using OpenMetaverse;
30using OpenSim.Region.Framework.Scenes; 29using OpenSim.Region.Framework.Scenes;
31 30
diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
index 35c2fc1..341dd3e 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -28,7 +28,6 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Framework.Interfaces;
32 31
33namespace OpenSim.Region.Framework.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
34{ 33{
diff --git a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
index f0a5473..ffae307 100644
--- a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
@@ -25,9 +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 System;
29using OpenSim.Framework; 28using OpenSim.Framework;
30using OpenMetaverse;
31 29
32namespace OpenSim.Region.Framework.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
33{ 31{
diff --git a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
index 011f8bb..85bc4da 100644
--- a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
@@ -25,8 +25,6 @@
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;
29using OpenSim.Framework;
30using OpenMetaverse; 28using OpenMetaverse;
31 29
32namespace OpenSim.Region.Framework.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
index 40e4c99..02174f8 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
@@ -25,9 +25,9 @@
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 OpenMetaverse;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.IO; 29using System.IO;
30using OpenMetaverse;
31using OpenSim.Region.Framework.Scenes; 31using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.Framework.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/ISceneObject.cs b/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
index 79a43d6..c713cc3 100644
--- a/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
@@ -1,4 +1,3 @@
1using System;
2using OpenMetaverse; 1using OpenMetaverse;
3 2
4namespace OpenSim.Region.Framework.Interfaces 3namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index 65620d3..6ba0068 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -25,8 +25,6 @@
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;
29using OpenSim.Framework;
30using OpenMetaverse; 28using OpenMetaverse;
31 29
32namespace OpenSim.Region.Framework.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index 91c80e3..078139d 100644
--- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using Nini.Config;
30using OpenMetaverse; 29using OpenMetaverse;
31 30
32namespace OpenSim.Region.Framework.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IWindModule.cs b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
index 96b303f..5b8b0ce 100644
--- a/OpenSim/Region/Framework/Interfaces/IWindModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
@@ -25,8 +25,6 @@
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;
29using OpenSim.Framework;
30using OpenMetaverse; 28using OpenMetaverse;
31 29
32namespace OpenSim.Region.Framework.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
index cdd2b7c..d6f9819 100644
--- a/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using Nwc.XmlRpc;
30 29
31namespace OpenSim.Region.Framework.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
32{ 31{
diff --git a/OpenSim/Region/Framework/Scenes/Animation.cs b/OpenSim/Region/Framework/Scenes/Animation.cs
index 3504717..cb0afa7 100644
--- a/OpenSim/Region/Framework/Scenes/Animation.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation.cs
@@ -25,7 +25,6 @@
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;
29using OpenMetaverse; 28using OpenMetaverse;
30 29
31namespace OpenSim.Region.Framework.Scenes 30namespace OpenSim.Region.Framework.Scenes
diff --git a/OpenSim/Region/Framework/Scenes/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
index f53bb78..49bcda8 100644
--- a/OpenSim/Region/Framework/Scenes/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
@@ -25,7 +25,6 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using OpenMetaverse; 29using OpenMetaverse;
31 30
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 178f1f7..7f2ac63 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -31,7 +31,6 @@ using System.Reflection;
31using System.Timers; 31using System.Timers;
32using log4net; 32using log4net;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenMetaverse.Packets;
35using OpenSim.Framework; 34using OpenSim.Framework;
36 35
37namespace OpenSim.Region.Framework.Scenes 36namespace OpenSim.Region.Framework.Scenes
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index a322766..504b90a 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -32,7 +32,6 @@ using System.Reflection;
32using log4net; 32using log4net;
33using OpenMetaverse; 33using OpenMetaverse;
34 34
35
36namespace OpenSim.Region.Framework.Scenes 35namespace OpenSim.Region.Framework.Scenes
37{ 36{
38 public class EntityManager : IEnumerable<EntityBase> 37 public class EntityManager : IEnumerable<EntityBase>
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 23e1278..9d47f87 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -26,13 +26,12 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
29using OpenMetaverse; 30using OpenMetaverse;
30using OpenSim.Framework; 31using OpenSim.Framework;
31using OpenSim.Framework.Client; 32using OpenSim.Framework.Client;
32using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Framework.Scenes; 34using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
34using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
35using System.Collections.Generic;
36 35
37namespace OpenSim.Region.Framework.Scenes 36namespace OpenSim.Region.Framework.Scenes
38{ 37{
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index cc82a48..4039288 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -27,20 +27,13 @@
27 */ 27 */
28 28
29using System; 29using System;
30using System.Collections;
31using System.Collections.Generic; 30using System.Collections.Generic;
32using System.Reflection; 31using System.Reflection;
33using System.Threading; 32using System.Threading;
34
35using log4net; 33using log4net;
36using Nini.Config;
37using OpenMetaverse; 34using OpenMetaverse;
38
39using OpenSim.Framework; 35using OpenSim.Framework;
40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers;
43using OpenSim.Region.Framework.Scenes;
44 37
45//using HyperGrid.Framework; 38//using HyperGrid.Framework;
46//using OpenSim.Region.Communications.Hypergrid; 39//using OpenSim.Region.Communications.Hypergrid;
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
index 7249029..ad98273 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
@@ -26,13 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Reflection;
30using System.Net; 29using System.Net;
31using OpenSim.Framework; 30using System.Reflection;
32using OpenSim.Framework.Communications;
33using OpenMetaverse;
34using log4net; 31using log4net;
35using Nini.Config; 32using OpenMetaverse;
33using OpenSim.Framework;
36 34
37namespace OpenSim.Region.Framework.Scenes.Hypergrid 35namespace OpenSim.Region.Framework.Scenes.Hypergrid
38{ 36{
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index c6d2bfc..ea03cf9 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -26,21 +26,13 @@
26 * 26 *
27 */ 27 */
28 28
29using System;
30using System.Collections;
31using System.Collections.Generic;
32using System.Reflection; 29using System.Reflection;
33using System.Threading;
34
35using log4net; 30using log4net;
36using Nini.Config; 31using Nini.Config;
37using OpenMetaverse; 32using OpenMetaverse;
38
39using OpenSim.Framework; 33using OpenSim.Framework;
40using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers;
43using OpenSim.Region.Framework.Scenes;
44 36
45namespace OpenSim.Region.Framework.Scenes.Hypergrid 37namespace OpenSim.Region.Framework.Scenes.Hypergrid
46{ 38{
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
index 1cb98db..558dfb4 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
@@ -26,15 +26,9 @@
26 * 26 *
27 */ 27 */
28 28
29using System;
30using System.Collections.Generic;
31
32using OpenMetaverse; 29using OpenMetaverse;
33
34using OpenSim.Framework; 30using OpenSim.Framework;
35
36using OpenSim.Framework.Communications.Cache; 31using OpenSim.Framework.Communications.Cache;
37using OpenSim.Region.Framework.Scenes;
38using TPFlags = OpenSim.Framework.Constants.TeleportFlags; 32using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
39 33
40namespace OpenSim.Region.Framework.Scenes.Hypergrid 34namespace OpenSim.Region.Framework.Scenes.Hypergrid
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index a17df71..f75ea8e 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -33,12 +33,10 @@ using System.Reflection;
33using System.Threading; 33using System.Threading;
34using log4net; 34using log4net;
35using OpenMetaverse; 35using OpenMetaverse;
36using OSD = OpenMetaverse.StructuredData.OSD;
37using OpenSim.Framework; 36using OpenSim.Framework;
38using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Communications.Capabilities; 39using OpenSim.Framework.Communications.Capabilities;
41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
43 41
44namespace OpenSim.Region.Framework.Scenes.Hypergrid 42namespace OpenSim.Region.Framework.Scenes.Hypergrid
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 848b497..e2eb89e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -30,26 +30,22 @@ using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.Drawing.Imaging; 31using System.Drawing.Imaging;
32using System.IO; 32using System.IO;
33using System.Xml; 33using System.Text;
34using System.Threading; 34using System.Threading;
35using System.Timers; 35using System.Timers;
36using System.Xml;
37using Nini.Config;
36using OpenMetaverse; 38using OpenMetaverse;
37using OpenMetaverse.Imaging; 39using OpenMetaverse.Imaging;
38using OpenMetaverse.Packets;
39using OpenSim.Framework; 40using OpenSim.Framework;
40using OpenSim.Framework.Console;
41using OpenSim.Framework.Communications; 41using OpenSim.Framework.Communications;
42using OpenSim.Framework.Communications.Cache; 42using OpenSim.Framework.Communications.Cache;
43using OpenSim.Framework.Servers; 43using OpenSim.Framework.Console;
44using OpenSim.Region.Framework.Interfaces; 44using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.Framework.Scenes.Scripting; 45using OpenSim.Region.Framework.Scenes.Scripting;
46using OpenSim.Region.Physics.Manager; 46using OpenSim.Region.Physics.Manager;
47using Nini.Config; 47using Timer=System.Timers.Timer;
48using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
49using Image = System.Drawing.Image;
50using TPFlags = OpenSim.Framework.Constants.TeleportFlags; 48using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
51using Timer = System.Timers.Timer;
52using OSD = OpenMetaverse.StructuredData.OSD;
53 49
54namespace OpenSim.Region.Framework.Scenes 50namespace OpenSim.Region.Framework.Scenes
55{ 51{
@@ -776,7 +772,7 @@ namespace OpenSim.Region.Framework.Scenes
776 int maintc = 0; 772 int maintc = 0;
777 while (!shuttingdown) 773 while (!shuttingdown)
778 { 774 {
779 maintc = System.Environment.TickCount; 775 maintc = Environment.TickCount;
780 776
781 TimeSpan SinceLastFrame = DateTime.Now - m_lastupdate; 777 TimeSpan SinceLastFrame = DateTime.Now - m_lastupdate;
782 // Aquire a lock so only one update call happens at once 778 // Aquire a lock so only one update call happens at once
@@ -802,7 +798,7 @@ namespace OpenSim.Region.Framework.Scenes
802 } 798 }
803 } 799 }
804 800
805 frameMS = System.Environment.TickCount; 801 frameMS = Environment.TickCount;
806 try 802 try
807 { 803 {
808 // Increment the frame counter 804 // Increment the frame counter
@@ -812,15 +808,15 @@ namespace OpenSim.Region.Framework.Scenes
812 if (m_frame == Int32.MaxValue) 808 if (m_frame == Int32.MaxValue)
813 m_frame = 0; 809 m_frame = 0;
814 810
815 physicsMS2 = System.Environment.TickCount; 811 physicsMS2 = Environment.TickCount;
816 if ((m_frame % m_update_physics == 0) && m_physics_enabled) 812 if ((m_frame % m_update_physics == 0) && m_physics_enabled)
817 m_sceneGraph.UpdatePreparePhysics(); 813 m_sceneGraph.UpdatePreparePhysics();
818 physicsMS2 = System.Environment.TickCount - physicsMS2; 814 physicsMS2 = Environment.TickCount - physicsMS2;
819 815
820 if (m_frame % m_update_entitymovement == 0) 816 if (m_frame % m_update_entitymovement == 0)
821 m_sceneGraph.UpdateEntityMovement(); 817 m_sceneGraph.UpdateEntityMovement();
822 818
823 physicsMS = System.Environment.TickCount; 819 physicsMS = Environment.TickCount;
824 if ((m_frame % m_update_physics == 0) && m_physics_enabled) 820 if ((m_frame % m_update_physics == 0) && m_physics_enabled)
825 physicsFPS = m_sceneGraph.UpdatePhysics( 821 physicsFPS = m_sceneGraph.UpdatePhysics(
826 Math.Max(SinceLastFrame.TotalSeconds, m_timespan) 822 Math.Max(SinceLastFrame.TotalSeconds, m_timespan)
@@ -828,10 +824,10 @@ namespace OpenSim.Region.Framework.Scenes
828 if (m_frame % m_update_physics == 0 && SynchronizeScene != null) 824 if (m_frame % m_update_physics == 0 && SynchronizeScene != null)
829 SynchronizeScene(this); 825 SynchronizeScene(this);
830 826
831 physicsMS = System.Environment.TickCount - physicsMS; 827 physicsMS = Environment.TickCount - physicsMS;
832 physicsMS += physicsMS2; 828 physicsMS += physicsMS2;
833 829
834 otherMS = System.Environment.TickCount; 830 otherMS = Environment.TickCount;
835 // run through all entities looking for updates (slow) 831 // run through all entities looking for updates (slow)
836 if (m_frame % m_update_entities == 0) 832 if (m_frame % m_update_entities == 0)
837 m_sceneGraph.UpdateEntities(); 833 m_sceneGraph.UpdateEntities();
@@ -864,7 +860,7 @@ namespace OpenSim.Region.Framework.Scenes
864 860
865 if (m_frame % m_update_land == 0) 861 if (m_frame % m_update_land == 0)
866 UpdateLand(); 862 UpdateLand();
867 otherMS = System.Environment.TickCount - otherMS; 863 otherMS = Environment.TickCount - otherMS;
868 // if (m_frame%m_update_avatars == 0) 864 // if (m_frame%m_update_avatars == 0)
869 // UpdateInWorldTime(); 865 // UpdateInWorldTime();
870 StatsReporter.AddPhysicsFPS(physicsFPS); 866 StatsReporter.AddPhysicsFPS(physicsFPS);
@@ -875,7 +871,7 @@ namespace OpenSim.Region.Framework.Scenes
875 StatsReporter.SetChildAgents(m_sceneGraph.GetChildAgentCount()); 871 StatsReporter.SetChildAgents(m_sceneGraph.GetChildAgentCount());
876 StatsReporter.SetObjects(m_sceneGraph.GetTotalObjectsCount()); 872 StatsReporter.SetObjects(m_sceneGraph.GetTotalObjectsCount());
877 StatsReporter.SetActiveObjects(m_sceneGraph.GetActiveObjectsCount()); 873 StatsReporter.SetActiveObjects(m_sceneGraph.GetActiveObjectsCount());
878 frameMS = System.Environment.TickCount - frameMS; 874 frameMS = Environment.TickCount - frameMS;
879 StatsReporter.addFrameMS(frameMS); 875 StatsReporter.addFrameMS(frameMS);
880 StatsReporter.addPhysicsMS(physicsMS); 876 StatsReporter.addPhysicsMS(physicsMS);
881 StatsReporter.addOtherMS(otherMS); 877 StatsReporter.addOtherMS(otherMS);
@@ -919,7 +915,7 @@ namespace OpenSim.Region.Framework.Scenes
919 915
920 m_lastupdate = DateTime.Now; 916 m_lastupdate = DateTime.Now;
921 } 917 }
922 maintc = System.Environment.TickCount - maintc; 918 maintc = Environment.TickCount - maintc;
923 maintc = (int)(m_timespan * 1000) - maintc; 919 maintc = (int)(m_timespan * 1000) - maintc;
924 920
925 if ((maintc < (m_timespan * 1000)) && maintc > 0) 921 if ((maintc < (m_timespan * 1000)) && maintc > 0)
@@ -1184,7 +1180,7 @@ namespace OpenSim.Region.Framework.Scenes
1184 { 1180 {
1185 #region Fallback default maptile generation 1181 #region Fallback default maptile generation
1186 1182
1187 int tc = System.Environment.TickCount; 1183 int tc = Environment.TickCount;
1188 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain"); 1184 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain");
1189 Bitmap mapbmp = new Bitmap(256, 256); 1185 Bitmap mapbmp = new Bitmap(256, 256);
1190 double[,] hm = Heightmap.GetDoubles(); 1186 double[,] hm = Heightmap.GetDoubles();
@@ -1301,7 +1297,7 @@ namespace OpenSim.Region.Framework.Scenes
1301 hfdiffi = hfdiffi + Math.Abs((int)(((hfdiff % 1) * 0.5f) * 10f) - 1); 1297 hfdiffi = hfdiffi + Math.Abs((int)(((hfdiff % 1) * 0.5f) * 10f) - 1);
1302 } 1298 }
1303 } 1299 }
1304 catch (System.OverflowException) 1300 catch (OverflowException)
1305 { 1301 {
1306 m_log.Debug("[MAPTILE]: Shadow failed at value: " + hfdiff.ToString()); 1302 m_log.Debug("[MAPTILE]: Shadow failed at value: " + hfdiff.ToString());
1307 ShadowDebugContinue = false; 1303 ShadowDebugContinue = false;
@@ -1325,7 +1321,7 @@ namespace OpenSim.Region.Framework.Scenes
1325 } 1321 }
1326 } 1322 }
1327 } 1323 }
1328 catch (System.ArgumentException) 1324 catch (ArgumentException)
1329 { 1325 {
1330 if (!terraincorruptedwarningsaid) 1326 if (!terraincorruptedwarningsaid)
1331 { 1327 {
@@ -1361,7 +1357,7 @@ namespace OpenSim.Region.Framework.Scenes
1361 Color water = Color.FromArgb((int)heightvalue, (int)heightvalue, 255); 1357 Color water = Color.FromArgb((int)heightvalue, (int)heightvalue, 255);
1362 mapbmp.SetPixel(x, (256 - y) - 1, water); 1358 mapbmp.SetPixel(x, (256 - y) - 1, water);
1363 } 1359 }
1364 catch (System.ArgumentException) 1360 catch (ArgumentException)
1365 { 1361 {
1366 if (!terraincorruptedwarningsaid) 1362 if (!terraincorruptedwarningsaid)
1367 { 1363 {
@@ -1379,7 +1375,7 @@ namespace OpenSim.Region.Framework.Scenes
1379 //m_log.Info("[MAPTILE]: Completed One row in " + tc + " ms"); 1375 //m_log.Info("[MAPTILE]: Completed One row in " + tc + " ms");
1380 } 1376 }
1381 1377
1382 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms"); 1378 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
1383 1379
1384 bool drawPrimVolume = true; 1380 bool drawPrimVolume = true;
1385 1381
@@ -1395,7 +1391,7 @@ namespace OpenSim.Region.Framework.Scenes
1395 1391
1396 if (drawPrimVolume) 1392 if (drawPrimVolume)
1397 { 1393 {
1398 tc = System.Environment.TickCount; 1394 tc = Environment.TickCount;
1399 m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile"); 1395 m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile");
1400 List<EntityBase> objs = GetEntities(); 1396 List<EntityBase> objs = GetEntities();
1401 1397
@@ -1547,7 +1543,7 @@ namespace OpenSim.Region.Framework.Scenes
1547 } // foreach loop over entities 1543 } // foreach loop over entities
1548 } // lock entities objs 1544 } // lock entities objs
1549 1545
1550 m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (System.Environment.TickCount - tc) + " ms"); 1546 m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms");
1551 } // end if drawPrimOnMaptle 1547 } // end if drawPrimOnMaptle
1552 1548
1553 byte[] data; 1549 byte[] data;
@@ -2146,7 +2142,7 @@ namespace OpenSim.Region.Framework.Scenes
2146 string spath = Path.Combine("ScriptEngines", RegionInfo.RegionID.ToString()); 2142 string spath = Path.Combine("ScriptEngines", RegionInfo.RegionID.ToString());
2147 spath = Path.Combine(spath, uuid.ToString()); 2143 spath = Path.Combine(spath, uuid.ToString());
2148 FileStream sfs = File.Create(spath + ".state"); 2144 FileStream sfs = File.Create(spath + ".state");
2149 System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); 2145 ASCIIEncoding enc = new ASCIIEncoding();
2150 Byte[] buf = enc.GetBytes(sdoc.InnerXml); 2146 Byte[] buf = enc.GetBytes(sdoc.InnerXml);
2151 sfs.Write(buf, 0, buf.Length); 2147 sfs.Write(buf, 0, buf.Length);
2152 sfs.Close(); 2148 sfs.Close();
@@ -2350,7 +2346,7 @@ namespace OpenSim.Region.Framework.Scenes
2350 CreateAndAddScenePresence(client); 2346 CreateAndAddScenePresence(client);
2351 } 2347 }
2352 2348
2353 m_LastLogin = System.Environment.TickCount; 2349 m_LastLogin = Environment.TickCount;
2354 EventManager.TriggerOnNewClient(client); 2350 EventManager.TriggerOnNewClient(client);
2355 } 2351 }
2356 2352
@@ -2891,7 +2887,7 @@ namespace OpenSim.Region.Framework.Scenes
2891 m_sceneGridService.SendCloseChildAgentConnections(loggingOffUser.UUID, new List<ulong>(loggingOffUser.KnownRegions.Keys)); 2887 m_sceneGridService.SendCloseChildAgentConnections(loggingOffUser.UUID, new List<ulong>(loggingOffUser.KnownRegions.Keys));
2892 loggingOffUser.ControllingClient.Kick(message); 2888 loggingOffUser.ControllingClient.Kick(message);
2893 // Give them a second to receive the message! 2889 // Give them a second to receive the message!
2894 System.Threading.Thread.Sleep(1000); 2890 Thread.Sleep(1000);
2895 loggingOffUser.ControllingClient.Close(true); 2891 loggingOffUser.ControllingClient.Close(true);
2896 } 2892 }
2897 else 2893 else
@@ -4157,7 +4153,7 @@ namespace OpenSim.Region.Framework.Scenes
4157 4153
4158 // A login in the last 4 mins? We can't be doing too badly 4154 // A login in the last 4 mins? We can't be doing too badly
4159 // 4155 //
4160 if ((System.Environment.TickCount - m_LastLogin) < 240000) 4156 if ((Environment.TickCount - m_LastLogin) < 240000)
4161 health++; 4157 health++;
4162 4158
4163 return 0; 4159 return 0;