aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2008-04-21 07:09:17 +0000
committerAdam Frisby2008-04-21 07:09:17 +0000
commitfef3b3689492dea63693c964bcdbec9f5137eb5e (patch)
tree7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim
parent* Terrain Module code has been reformatted to comply with guidelines. (diff)
downloadopensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs10
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs7
-rw-r--r--OpenSim/Data/AssetDataBase.cs3
-rw-r--r--OpenSim/Data/Base/BaseRowMapper.cs2
-rw-r--r--OpenSim/Data/Base/BaseSchema.cs1
-rw-r--r--OpenSim/Data/Base/BaseTableMapper.cs1
-rw-r--r--OpenSim/Data/DB4o/DB4oUserData.cs4
-rw-r--r--OpenSim/Data/DataStoreBase.cs4
-rw-r--r--OpenSim/Data/GridDataBase.cs3
-rw-r--r--OpenSim/Data/IGridData.cs1
-rw-r--r--OpenSim/Data/InventoryDataBase.cs4
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs5
-rw-r--r--OpenSim/Data/MSSQL/MSSQLDataStore.cs7
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs5
-rw-r--r--OpenSim/Data/MSSQL/MSSQLInventoryData.cs5
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs4
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs13
-rw-r--r--OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs1
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs5
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs9
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs7
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs5
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs13
-rw-r--r--OpenSim/Data/MySQLMapper/MySQLDataReader.cs4
-rw-r--r--OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs1
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs14
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs18
-rw-r--r--OpenSim/Data/NHibernate/NHibernateManager.cs9
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs16
-rw-r--r--OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs6
-rw-r--r--OpenSim/Data/OpenSimDataReader.cs1
-rw-r--r--OpenSim/Data/OpenSimDatabaseConnector.cs2
-rw-r--r--OpenSim/Data/OpenSimObjectFieldMapper.cs2
-rw-r--r--OpenSim/Data/OpenSimTableMapper.cs2
-rw-r--r--OpenSim/Data/PrimitiveBaseShapeTableMapper.cs4
-rw-r--r--OpenSim/Data/ReservationData.cs9
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteManager.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs5
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs17
-rw-r--r--OpenSim/Data/UserDataBase.cs2
-rw-r--r--OpenSim/Framework/AgentInventory.cs5
-rw-r--r--OpenSim/Framework/AssetConfig.cs1
-rw-r--r--OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs8
-rw-r--r--OpenSim/Framework/AvatarPickerAvatar.cs3
-rw-r--r--OpenSim/Framework/AvatarWearable.cs6
-rw-r--r--OpenSim/Framework/ClientManager.cs8
-rw-r--r--OpenSim/Framework/Communications/CAPSService.cs3
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs10
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServer.cs5
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs10
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs7
-rw-r--r--OpenSim/Framework/Communications/Cache/GridAssetClient.cs5
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs13
-rw-r--r--OpenSim/Framework/Communications/Cache/SQLAssetServer.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs10
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs9
-rw-r--r--OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs9
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs3
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs1
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs2
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs4
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs2
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs6
-rw-r--r--OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs2
-rw-r--r--OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs2
-rw-r--r--OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs1
-rw-r--r--OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs5
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs11
-rw-r--r--OpenSim/Framework/Communications/RestClient/RestClient.cs5
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs6
-rw-r--r--OpenSim/Framework/Communications/XMPP/Stanza.cs2
-rw-r--r--OpenSim/Framework/Communications/XMPP/XMPPParser.cs6
-rw-r--r--OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs8
-rw-r--r--OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs4
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs3
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs5
-rw-r--r--OpenSim/Framework/Console/OpenSimAppender.cs7
-rw-r--r--OpenSim/Framework/Constants.cs4
-rw-r--r--OpenSim/Framework/EstateSettings.cs5
-rw-r--r--OpenSim/Framework/FriendListItem.cs2
-rw-r--r--OpenSim/Framework/GridConfig.cs1
-rw-r--r--OpenSim/Framework/GridInstantMessage.cs1
-rw-r--r--OpenSim/Framework/IAssetServer.cs2
-rw-r--r--OpenSim/Framework/IInventoryData.cs2
-rw-r--r--OpenSim/Framework/InventoryCollection.cs2
-rw-r--r--OpenSim/Framework/InventoryConfig.cs12
-rw-r--r--OpenSim/Framework/InventoryFolderBase.cs3
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs3
-rw-r--r--OpenSim/Framework/JId.cs2
-rw-r--r--OpenSim/Framework/LandData.cs2
-rw-r--r--OpenSim/Framework/Login.cs3
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs5
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs2
-rw-r--r--OpenSim/Framework/PacketPool.cs15
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs2
-rw-r--r--OpenSim/Framework/RegionInfo.cs1
-rw-r--r--OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs3
-rw-r--r--OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs12
-rw-r--r--OpenSim/Framework/RegionUpData.cs2
-rw-r--r--OpenSim/Framework/SerializableInventory.cs2
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs14
-rw-r--r--OpenSim/Framework/Servers/GenericHTTPMethod.cs1
-rw-r--r--OpenSim/Framework/Servers/MessageServerInfo.cs2
-rw-r--r--OpenSim/Framework/Statistics/AssetStatsReporter.cs1
-rw-r--r--OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs2
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsReporter.cs5
-rw-r--r--OpenSim/Framework/Statistics/UserStatsReporter.cs1
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs7
-rw-r--r--OpenSim/Framework/ThreadTracker.cs11
-rw-r--r--OpenSim/Framework/UserConfig.cs1
-rw-r--r--OpenSim/Framework/Util.cs16
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs6
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs7
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs10
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs7
-rw-r--r--OpenSim/Grid/GridServer/Program.cs6
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs10
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs4
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs7
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs9
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs14
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceInformer.cs13
-rw-r--r--OpenSim/Grid/MessagingServer/UserPresenceData.cs3
-rw-r--r--OpenSim/Grid/MessagingServer/WorkUnitBase.cs4
-rw-r--r--OpenSim/Grid/MessagingServer/WorkUnitPresenceUpdate.cs4
-rw-r--r--OpenSim/Grid/MessagingServer/XMPPHTTPService.cs11
-rw-r--r--OpenSim/Grid/ScriptServer/Application.cs3
-rw-r--r--OpenSim/Grid/ScriptServer/FakeScene.cs3
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingObject.cs3
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingServer.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs2
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs1
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs10
-rw-r--r--OpenSim/Grid/UserServer/Main.cs10
-rw-r--r--OpenSim/Grid/UserServer/MessageServersConnector.cs15
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs11
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs17
-rw-r--r--OpenSim/Region/Application/Application.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs17
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs9
-rw-r--r--OpenSim/Region/ClientStack/PacketServer.cs1
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs7
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs10
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs11
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs1
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs8
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs18
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs7
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs9
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs24
-rw-r--r--OpenSim/Region/DataSnapshot/EstateSnapshot.cs9
-rw-r--r--OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs18
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs10
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/ICommand.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/ICommandableModule.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/ICommander.cs4
-rw-r--r--OpenSim/Region/Environment/Interfaces/ILandChannel.cs5
-rw-r--r--OpenSim/Region/Environment/Interfaces/ILandObject.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/ITextureSender.cs2
-rw-r--r--OpenSim/Region/Environment/Interfaces/IXMLRPC.cs2
-rw-r--r--OpenSim/Region/Environment/ModuleLoader.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/AssetDownloadModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs17
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs14
-rw-r--r--OpenSim/Region/Environment/Modules/CommanderTestModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/DynamicTextureModule.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/FriendsModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/GroupsModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/InventoryModule.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs14
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs12
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs14
-rw-r--r--OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/TextureSender.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/TreePopulatorModule.cs15
-rw-r--r--OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs11
-rw-r--r--OpenSim/Region/Environment/Modules/VectorRenderModule.cs20
-rw-r--r--OpenSim/Region/Environment/Modules/VoiceModule.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/WorldCommModule.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/XMLRPCModule.cs15
-rw-r--r--OpenSim/Region/Environment/PermissionManager.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/AvatarAnimations.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/AvatarAppearance.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/EntityBase.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs27
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs20
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs4
-rw-r--r--OpenSim/Region/Environment/StorageManager.cs4
-rw-r--r--OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs3
-rw-r--r--OpenSim/Region/Environment/Types/UpdateQueue.cs11
-rw-r--r--OpenSim/Region/Examples/SimpleModule/Properties/AssemblyInfo.cs1
-rw-r--r--OpenSim/Region/Examples/SimpleModule/RegionModule.cs2
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs5
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs5
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs6
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs7
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs5
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs5
-rw-r--r--OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs63
-rw-r--r--OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs4
-rw-r--r--OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs1
-rw-r--r--OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs1
-rw-r--r--OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs35
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/CollisionLocker.cs1
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs4
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs6
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsSensor.cs3
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs1
-rw-r--r--OpenSim/Region/Physics/Meshing/SimpleHull.cs1
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs6
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs21
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODETestClass.cs7
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs16
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs183
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Executor.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs33
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_Types.cs26
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs18
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs19
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs32
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs22
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs25
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs7
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs7
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs2
-rw-r--r--OpenSim/TestSuite/BotManager.cs13
-rw-r--r--OpenSim/TestSuite/Main.cs10
-rw-r--r--OpenSim/TestSuite/PhysicsBot.cs15
-rw-r--r--OpenSim/TestSuite/Util.cs2
-rw-r--r--OpenSim/Tests/Common/DoubleToleranceConstraint.cs2
-rw-r--r--OpenSim/Tests/Common/TestHelper.cs2
-rw-r--r--OpenSim/Tests/OpenSim/Framework/UtilTest.cs1
-rw-r--r--OpenSim/Tests/UserServer/Stress/UserServerStressTest.cs5
-rw-r--r--OpenSim/Tools/Export/OpenSimExport.cs3
-rw-r--r--OpenSim/Tools/pCampBot/BotManager.cs13
-rw-r--r--OpenSim/Tools/pCampBot/PhysicsBot.cs14
-rw-r--r--OpenSim/Tools/pCampBot/pCampBot.cs7
306 files changed, 1003 insertions, 1298 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 62cd41d..48e988c 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -25,9 +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.Reflection;
29using System.Threading;
30using log4net;
28using Mono.Addins; 31using Mono.Addins;
29using OpenSim.Framework; 32using OpenSim.Framework;
30using OpenSim.Framework.Console;
31using OpenSim.Framework.RegionLoader.Filesystem; 33using OpenSim.Framework.RegionLoader.Filesystem;
32using OpenSim.Framework.RegionLoader.Web; 34using OpenSim.Framework.RegionLoader.Web;
33 35
@@ -39,7 +41,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
39 [Extension("/OpenSim/Startup")] 41 [Extension("/OpenSim/Startup")]
40 public class LoadRegionsPlugin : IApplicationPlugin 42 public class LoadRegionsPlugin : IApplicationPlugin
41 { 43 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 45
44 public void Initialise(OpenSimMain openSim) 46 public void Initialise(OpenSimMain openSim)
45 { 47 {
@@ -64,7 +66,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
64 66
65 for (int i = 0; i < regionsToLoad.Length; i++) 67 for (int i = 0; i < regionsToLoad.Length; i++)
66 { 68 {
67 m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")"); 69 m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + Thread.CurrentThread.ManagedThreadId.ToString() + ")");
68 openSim.CreateRegion(regionsToLoad[i], true); 70 openSim.CreateRegion(regionsToLoad[i], true);
69 } 71 }
70 72
@@ -94,7 +96,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
94 { 96 {
95 if (regionhandle == regionsToLoad[i].RegionHandle) 97 if (regionhandle == regionsToLoad[i].RegionHandle)
96 { 98 {
97 m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")"); 99 m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + Thread.CurrentThread.ManagedThreadId.ToString() + ")");
98 openSim.CreateRegion(regionsToLoad[i], true); 100 openSim.CreateRegion(regionsToLoad[i], true);
99 } 101 }
100 } 102 }
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 6450ec7..3e0f4f6 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -27,14 +27,15 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Net;
31using System.IO; 30using System.IO;
31using System.Net;
32using System.Reflection;
32using System.Timers; 33using System.Timers;
33using libsecondlife; 34using libsecondlife;
35using log4net;
34using Mono.Addins; 36using Mono.Addins;
35using Nwc.XmlRpc; 37using Nwc.XmlRpc;
36using OpenSim.Framework; 38using OpenSim.Framework;
37using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
39using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Environment.Scenes;
40 41
@@ -46,7 +47,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
46 [Extension("/OpenSim/Startup")] 47 [Extension("/OpenSim/Startup")]
47 public class RemoteAdminPlugin : IApplicationPlugin 48 public class RemoteAdminPlugin : IApplicationPlugin
48 { 49 {
49 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 51
51 private OpenSimMain m_app; 52 private OpenSimMain m_app;
52 private BaseHttpServer m_httpd; 53 private BaseHttpServer m_httpd;
diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index 0a58126..b30ae73 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.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 libsecondlife; 28using libsecondlife;
32using OpenSim.Framework; 29using OpenSim.Framework;
33 30
diff --git a/OpenSim/Data/Base/BaseRowMapper.cs b/OpenSim/Data/Base/BaseRowMapper.cs
index 45af15a..a61ce49d 100644
--- a/OpenSim/Data/Base/BaseRowMapper.cs
+++ b/OpenSim/Data/Base/BaseRowMapper.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 OpenSim.Data.Base;
29
30namespace OpenSim.Data.Base 28namespace OpenSim.Data.Base
31{ 29{
32 public abstract class BaseRowMapper 30 public abstract class BaseRowMapper
diff --git a/OpenSim/Data/Base/BaseSchema.cs b/OpenSim/Data/Base/BaseSchema.cs
index f6bea50..656433f 100644
--- a/OpenSim/Data/Base/BaseSchema.cs
+++ b/OpenSim/Data/Base/BaseSchema.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenSim.Data.Base;
30 29
31namespace OpenSim.Data.Base 30namespace OpenSim.Data.Base
32{ 31{
diff --git a/OpenSim/Data/Base/BaseTableMapper.cs b/OpenSim/Data/Base/BaseTableMapper.cs
index d088769..ad60009 100644
--- a/OpenSim/Data/Base/BaseTableMapper.cs
+++ b/OpenSim/Data/Base/BaseTableMapper.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using System.Data.Common; 30using System.Data.Common;
31using OpenSim.Data.Base;
32 31
33namespace OpenSim.Data.Base 32namespace OpenSim.Data.Base
34{ 33{
diff --git a/OpenSim/Data/DB4o/DB4oUserData.cs b/OpenSim/Data/DB4o/DB4oUserData.cs
index d0108ab..4a2fc9c 100644
--- a/OpenSim/Data/DB4o/DB4oUserData.cs
+++ b/OpenSim/Data/DB4o/DB4oUserData.cs
@@ -174,10 +174,10 @@ namespace OpenSim.Data.DB4o
174 174
175 175
176 176
177 public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 177 public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
178 { 178 {
179 //Do nothing yet 179 //Do nothing yet
180 List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>(); 180 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
181 return returnlist; 181 return returnlist;
182 } 182 }
183 183
diff --git a/OpenSim/Data/DataStoreBase.cs b/OpenSim/Data/DataStoreBase.cs
index 607dcd7..e361799 100644
--- a/OpenSim/Data/DataStoreBase.cs
+++ b/OpenSim/Data/DataStoreBase.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.Data 28namespace OpenSim.Data
33{ 29{
34 public abstract class DataStoreBase 30 public abstract class DataStoreBase
diff --git a/OpenSim/Data/GridDataBase.cs b/OpenSim/Data/GridDataBase.cs
index 0a90eca..036e2eb 100644
--- a/OpenSim/Data/GridDataBase.cs
+++ b/OpenSim/Data/GridDataBase.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 libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Data 30namespace OpenSim.Data
diff --git a/OpenSim/Data/IGridData.cs b/OpenSim/Data/IGridData.cs
index c924031..7681516 100644
--- a/OpenSim/Data/IGridData.cs
+++ b/OpenSim/Data/IGridData.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 libsecondlife; 28using libsecondlife;
30 29
31namespace OpenSim.Data 30namespace OpenSim.Data
diff --git a/OpenSim/Data/InventoryDataBase.cs b/OpenSim/Data/InventoryDataBase.cs
index 242d016..0f4799e 100644
--- a/OpenSim/Data/InventoryDataBase.cs
+++ b/OpenSim/Data/InventoryDataBase.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.Data 28namespace OpenSim.Data
33{ 29{
34 public abstract class InventoryDataBase 30 public abstract class InventoryDataBase
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index e68b5c4..2029b80 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -29,15 +29,16 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
37{ 38{
38 internal class MSSQLAssetData : AssetDataBase 39 internal class MSSQLAssetData : AssetDataBase
39 { 40 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 42
42 private MSSQLManager database; 43 private MSSQLManager database;
43 44
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
index 525eeca..e881cf1 100644
--- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
@@ -30,20 +30,19 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.IO; 32using System.IO;
33using System.Reflection;
33using libsecondlife; 34using libsecondlife;
35using log4net;
34using OpenSim.Framework; 36using OpenSim.Framework;
35using OpenSim.Framework.Console;
36using OpenSim.Data;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
39using OpenSim.Data.MSSQL;
40 39
41namespace OpenSim.Data.MSSQL 40namespace OpenSim.Data.MSSQL
42{ 41{
43 public class MSSQLDataStore : IRegionDataStore 42 public class MSSQLDataStore : IRegionDataStore
44 { 43 {
45 // private static FileSystemDataStore Instance = new FileSystemDataStore(); 44 // private static FileSystemDataStore Instance = new FileSystemDataStore();
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 46
48 private const string m_primSelect = "select * from prims"; 47 private const string m_primSelect = "select * from prims";
49 private const string m_shapeSelect = "select * from primshapes"; 48 private const string m_shapeSelect = "select * from primshapes";
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 5617900..3d859ff 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection;
31using System.Security.Cryptography; 32using System.Security.Cryptography;
32using System.Text; 33using System.Text;
33using libsecondlife; 34using libsecondlife;
34using OpenSim.Framework.Console; 35using log4net;
35 36
36namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
37{ 38{
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
40 /// </summary> 41 /// </summary>
41 public class MSSQLGridData : GridDataBase 42 public class MSSQLGridData : GridDataBase
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// Database manager 47 /// Database manager
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 09d4710..27f8b60 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -29,9 +29,10 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
37{ 38{
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
40 /// </summary> 41 /// </summary>
41 public class MSSQLInventoryData : IInventoryData 42 public class MSSQLInventoryData : IInventoryData
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// The database manager 47 /// The database manager
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index e3179f7..6d73c64 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -32,8 +32,8 @@ using System.Data.SqlClient;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using libsecondlife; 34using libsecondlife;
35using log4net;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Console;
37 37
38namespace OpenSim.Data.MSSQL 38namespace OpenSim.Data.MSSQL
39{ 39{
@@ -42,7 +42,7 @@ namespace OpenSim.Data.MSSQL
42 /// </summary> 42 /// </summary>
43 public class MSSQLManager 43 public class MSSQLManager
44 { 44 {
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 /// <summary> 47 /// <summary>
48 /// The database connection object 48 /// The database connection object
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 3d4cabf..a44d022 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -29,9 +29,10 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
37{ 38{
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
40 /// </summary> 41 /// </summary>
41 public class MSSQLUserData : UserDataBase 42 public class MSSQLUserData : UserDataBase
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// Database manager for MySQL 47 /// Database manager for MySQL
@@ -326,9 +327,9 @@ namespace OpenSim.Data.MSSQL
326 327
327 328
328 329
329 override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 330 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
330 { 331 {
331 List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>(); 332 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
332 string[] querysplit; 333 string[] querysplit;
333 querysplit = query.Split(' '); 334 querysplit = query.Split(' ');
334 if (querysplit.Length == 2) 335 if (querysplit.Length == 2)
@@ -350,7 +351,7 @@ namespace OpenSim.Data.MSSQL
350 351
351 while (reader.Read()) 352 while (reader.Read())
352 { 353 {
353 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 354 AvatarPickerAvatar user = new AvatarPickerAvatar();
354 user.AvatarID = new LLUUID((string)reader["UUID"]); 355 user.AvatarID = new LLUUID((string)reader["UUID"]);
355 user.firstName = (string)reader["username"]; 356 user.firstName = (string)reader["username"];
356 user.lastName = (string)reader["lastname"]; 357 user.lastName = (string)reader["lastname"];
@@ -385,7 +386,7 @@ namespace OpenSim.Data.MSSQL
385 386
386 while (reader.Read()) 387 while (reader.Read())
387 { 388 {
388 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 389 AvatarPickerAvatar user = new AvatarPickerAvatar();
389 user.AvatarID = new LLUUID((string)reader["UUID"]); 390 user.AvatarID = new LLUUID((string)reader["UUID"]);
390 user.firstName = (string)reader["username"]; 391 user.firstName = (string)reader["username"];
391 user.lastName = (string)reader["lastname"]; 392 user.lastName = (string)reader["lastname"];
diff --git a/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs b/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
index 25ea1b4..4c807b1 100644
--- a/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
+++ b/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Data.Common; 29using System.Data.Common;
30using System.Data.SqlClient; 30using System.Data.SqlClient;
31using OpenSim.Data;
32 31
33namespace OpenSim.Data.MSSQLMapper 32namespace OpenSim.Data.MSSQLMapper
34{ 33{
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 50f1cc5..111f7d1 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -28,16 +28,17 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
33using log4net;
32using MySql.Data.MySqlClient; 34using MySql.Data.MySqlClient;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.MySQL 37namespace OpenSim.Data.MySQL
37{ 38{
38 internal class MySQLAssetData : AssetDataBase, IPlugin 39 internal class MySQLAssetData : AssetDataBase, IPlugin
39 { 40 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 42
42 private MySQLManager _dbConnection; 43 private MySQLManager _dbConnection;
43 44
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index de15421..08e4456 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -28,12 +28,13 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Diagnostics;
32using System.IO; 31using System.IO;
32using System.Reflection;
33using System.Threading;
33using libsecondlife; 34using libsecondlife;
35using log4net;
34using MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
35using OpenSim.Framework; 37using OpenSim.Framework;
36using OpenSim.Framework.Console;
37using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Environment.Scenes;
39 40
@@ -41,7 +42,7 @@ namespace OpenSim.Data.MySQL
41{ 42{
42 public class MySQLDataStore : IRegionDataStore 43 public class MySQLDataStore : IRegionDataStore
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 private const string m_primSelect = "select * from prims"; 47 private const string m_primSelect = "select * from prims";
47 private const string m_shapeSelect = "select * from primshapes"; 48 private const string m_shapeSelect = "select * from primshapes";
@@ -1498,7 +1499,7 @@ namespace OpenSim.Data.MySQL
1498 { 1499 {
1499 m_log.Error("[MySql]: Error connecting to MySQL server: " + ex.Message); 1500 m_log.Error("[MySql]: Error connecting to MySQL server: " + ex.Message);
1500 m_log.Error("[MySql]: Application is terminating!"); 1501 m_log.Error("[MySql]: Application is terminating!");
1501 System.Threading.Thread.CurrentThread.Abort(); 1502 Thread.CurrentThread.Abort();
1502 } 1503 }
1503 } 1504 }
1504 1505
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 639f899..b6274d4 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -28,11 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection;
31using System.Security.Cryptography; 32using System.Security.Cryptography;
32using System.Text; 33using System.Text;
33using System.Text.RegularExpressions;
34using libsecondlife; 34using libsecondlife;
35using OpenSim.Framework.Console; 35using log4net;
36 36
37namespace OpenSim.Data.MySQL 37namespace OpenSim.Data.MySQL
38{ 38{
@@ -41,7 +41,7 @@ namespace OpenSim.Data.MySQL
41 /// </summary> 41 /// </summary>
42 public class MySQLGridData : GridDataBase 42 public class MySQLGridData : GridDataBase
43 { 43 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 /// <summary> 46 /// <summary>
47 /// MySQL Database Manager 47 /// MySQL Database Manager
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 82bbf4f..3aed301 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -27,10 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using MySql.Data.MySqlClient; 33using MySql.Data.MySqlClient;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Framework.Console;
34 35
35namespace OpenSim.Data.MySQL 36namespace OpenSim.Data.MySQL
36{ 37{
@@ -39,8 +40,8 @@ namespace OpenSim.Data.MySQL
39 /// </summary> 40 /// </summary>
40 public class MySQLInventoryData : IInventoryData 41 public class MySQLInventoryData : IInventoryData
41 { 42 {
42 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
43 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// The database manager 47 /// The database manager
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index a122954..1e7038f 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.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.Data.SqlClient;
32using System.IO; 31using System.IO;
33using System.Reflection; 32using System.Reflection;
34using libsecondlife; 33using libsecondlife;
34using log4net;
35using MySql.Data.MySqlClient; 35using MySql.Data.MySqlClient;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Console;
38 37
39namespace OpenSim.Data.MySQL 38namespace OpenSim.Data.MySQL
40{ 39{
@@ -43,7 +42,7 @@ namespace OpenSim.Data.MySQL
43 /// </summary> 42 /// </summary>
44 internal class MySQLManager 43 internal class MySQLManager
45 { 44 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 46
48 /// <summary> 47 /// <summary>
49 /// The database connection object 48 /// The database connection object
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index d04c932..66b65dc 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection;
31using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.MySQL 37namespace OpenSim.Data.MySQL
37{ 38{
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MySQL
40 /// </summary> 41 /// </summary>
41 internal class MySQLUserData : UserDataBase 42 internal class MySQLUserData : UserDataBase
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// Database manager for MySQL 47 /// Database manager for MySQL
@@ -348,9 +349,9 @@ namespace OpenSim.Data.MySQL
348 m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called"); 349 m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
349 } 350 }
350 351
351 override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 352 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
352 { 353 {
353 List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>(); 354 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
354 355
355 Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]"); 356 Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]");
356 357
@@ -373,7 +374,7 @@ namespace OpenSim.Data.MySQL
373 374
374 while (reader.Read()) 375 while (reader.Read())
375 { 376 {
376 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 377 AvatarPickerAvatar user = new AvatarPickerAvatar();
377 user.AvatarID = new LLUUID((string) reader["UUID"]); 378 user.AvatarID = new LLUUID((string) reader["UUID"]);
378 user.firstName = (string) reader["username"]; 379 user.firstName = (string) reader["username"];
379 user.lastName = (string) reader["lastname"]; 380 user.lastName = (string) reader["lastname"];
@@ -407,7 +408,7 @@ namespace OpenSim.Data.MySQL
407 408
408 while (reader.Read()) 409 while (reader.Read())
409 { 410 {
410 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 411 AvatarPickerAvatar user = new AvatarPickerAvatar();
411 user.AvatarID = new LLUUID((string) reader["UUID"]); 412 user.AvatarID = new LLUUID((string) reader["UUID"]);
412 user.firstName = (string) reader["username"]; 413 user.firstName = (string) reader["username"];
413 user.lastName = (string) reader["lastname"]; 414 user.lastName = (string) reader["lastname"];
diff --git a/OpenSim/Data/MySQLMapper/MySQLDataReader.cs b/OpenSim/Data/MySQLMapper/MySQLDataReader.cs
index f242007..9b5de2a 100644
--- a/OpenSim/Data/MySQLMapper/MySQLDataReader.cs
+++ b/OpenSim/Data/MySQLMapper/MySQLDataReader.cs
@@ -25,11 +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;
30using System.Data; 28using System.Data;
31using System.Text;
32using OpenSim.Data.Base;
33 29
34namespace OpenSim.Data.MySQLMapper 30namespace OpenSim.Data.MySQLMapper
35{ 31{
diff --git a/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs b/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
index 16f133a..37b94fa 100644
--- a/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
+++ b/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
@@ -28,7 +28,6 @@
28using System.Data; 28using System.Data;
29using System.Data.Common; 29using System.Data.Common;
30using MySql.Data.MySqlClient; 30using MySql.Data.MySqlClient;
31using OpenSim.Data;
32using OpenSim.Data.Base; 31using OpenSim.Data.Base;
33 32
34namespace OpenSim.Data.MySQLMapper 33namespace OpenSim.Data.MySQLMapper
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index cc018dd..db90d09 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -26,17 +26,15 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Data; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32using NHibernate; 33using NHibernate;
33using NHibernate.Cfg; 34using NHibernate.Cfg;
34using NHibernate.Tool.hbm2ddl;
35using NHibernate.Mapping.Attributes; 35using NHibernate.Mapping.Attributes;
36using OpenSim.Data;
37using OpenSim.Framework; 36using OpenSim.Framework;
38using OpenSim.Framework.Console; 37using Environment=NHibernate.Cfg.Environment;
39using Environment = NHibernate.Cfg.Environment;
40 38
41namespace OpenSim.Data.NHibernate 39namespace OpenSim.Data.NHibernate
42{ 40{
@@ -45,7 +43,7 @@ namespace OpenSim.Data.NHibernate
45 /// </summary> 43 /// </summary>
46 public class NHibernateAssetData : AssetDataBase, IDisposable 44 public class NHibernateAssetData : AssetDataBase, IDisposable
47 { 45 {
48 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);
49 47
50 private Configuration cfg; 48 private Configuration cfg;
51 private ISessionFactory factory; 49 private ISessionFactory factory;
@@ -67,8 +65,8 @@ namespace OpenSim.Data.NHibernate
67 cfg.AddAssembly("OpenSim.Data.NHibernate"); 65 cfg.AddAssembly("OpenSim.Data.NHibernate");
68 66
69 HbmSerializer.Default.Validate = true; 67 HbmSerializer.Default.Validate = true;
70 using ( System.IO.MemoryStream stream = 68 using ( MemoryStream stream =
71 HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) 69 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
72 cfg.AddInputStream(stream); 70 cfg.AddInputStream(stream);
73 71
74 // new SchemaExport(cfg).Create(true, true); 72 // new SchemaExport(cfg).Create(true, true);
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index a004e29..1ac0f0c 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -26,25 +26,23 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Data;
30using System.Reflection;
31using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
31using System.Reflection;
32using libsecondlife; 32using libsecondlife;
33using log4net;
33using NHibernate; 34using NHibernate;
34using NHibernate.Expression;
35using NHibernate.Cfg; 35using NHibernate.Cfg;
36using NHibernate.Tool.hbm2ddl; 36using NHibernate.Expression;
37using NHibernate.Mapping.Attributes; 37using NHibernate.Mapping.Attributes;
38using OpenSim.Data;
39using OpenSim.Framework; 38using OpenSim.Framework;
40using OpenSim.Framework.Console; 39using Environment=NHibernate.Cfg.Environment;
41using Environment = NHibernate.Cfg.Environment;
42 40
43namespace OpenSim.Data.NHibernate 41namespace OpenSim.Data.NHibernate
44{ 42{
45 public class NHibernateInventoryData: IInventoryData 43 public class NHibernateInventoryData: IInventoryData
46 { 44 {
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 46
49 private Configuration cfg; 47 private Configuration cfg;
50 private ISessionFactory factory; 48 private ISessionFactory factory;
@@ -74,8 +72,8 @@ namespace OpenSim.Data.NHibernate
74 cfg.AddAssembly("OpenSim.Data.NHibernate"); 72 cfg.AddAssembly("OpenSim.Data.NHibernate");
75 73
76 HbmSerializer.Default.Validate = true; 74 HbmSerializer.Default.Validate = true;
77 using ( System.IO.MemoryStream stream = 75 using ( MemoryStream stream =
78 HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) 76 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
79 cfg.AddInputStream(stream); 77 cfg.AddInputStream(stream);
80 78
81 // new SchemaExport(cfg).Create(true, true); 79 // new SchemaExport(cfg).Create(true, true);
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs
index edef8ad..6f13294 100644
--- a/OpenSim/Data/NHibernate/NHibernateManager.cs
+++ b/OpenSim/Data/NHibernate/NHibernateManager.cs
@@ -25,18 +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.Reflection;
29using System.Collections.Generic; 29using log4net;
30using System.Data;
31using libsecondlife;
32using NHibernate; 30using NHibernate;
33using NHibernate.Cfg;
34 31
35namespace OpenSim.Data.NHibernate 32namespace OpenSim.Data.NHibernate
36{ 33{
37 internal class NHibernateManager 34 internal class NHibernateManager
38 { 35 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 36 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 37
41 private ISessionFactory factory; 38 private ISessionFactory factory;
42 private ISession session; 39 private ISession session;
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 0bbebaa..c0fe26c 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.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;
29using System.Data;
30using System.Reflection;
31using System.Collections.Generic; 28using System.Collections.Generic;
29using System.IO;
30using System.Reflection;
32using libsecondlife; 31using libsecondlife;
32using log4net;
33using NHibernate; 33using NHibernate;
34using NHibernate.Cfg; 34using NHibernate.Cfg;
35using NHibernate.Expression; 35using NHibernate.Expression;
36using NHibernate.Tool.hbm2ddl;
37using NHibernate.Mapping.Attributes; 36using NHibernate.Mapping.Attributes;
38using OpenSim.Data;
39using OpenSim.Framework; 37using OpenSim.Framework;
40using OpenSim.Framework.Console;
41using Environment = NHibernate.Cfg.Environment;
42 38
43namespace OpenSim.Data.NHibernate 39namespace OpenSim.Data.NHibernate
44{ 40{
@@ -47,7 +43,7 @@ namespace OpenSim.Data.NHibernate
47 /// </summary> 43 /// </summary>
48 public class NHibernateUserData : UserDataBase 44 public class NHibernateUserData : UserDataBase
49 { 45 {
50 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);
51 47
52 private Configuration cfg; 48 private Configuration cfg;
53 private ISessionFactory factory; 49 private ISessionFactory factory;
@@ -69,8 +65,8 @@ namespace OpenSim.Data.NHibernate
69 cfg.AddAssembly("OpenSim.Data.NHibernate"); 65 cfg.AddAssembly("OpenSim.Data.NHibernate");
70 66
71 HbmSerializer.Default.Validate = true; 67 HbmSerializer.Default.Validate = true;
72 using ( System.IO.MemoryStream stream = 68 using ( MemoryStream stream =
73 HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) 69 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
74 cfg.AddInputStream(stream); 70 cfg.AddInputStream(stream);
75 71
76 // new SchemaExport(cfg).Create(true, true); 72 // new SchemaExport(cfg).Create(true, true);
diff --git a/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
index 2c1f7dd..e4f1dc2 100644
--- a/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
+++ b/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
@@ -27,10 +27,10 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife;
30using NHibernate; 31using NHibernate;
31using NHibernate.SqlTypes; 32using NHibernate.SqlTypes;
32using NHibernate.UserTypes; 33using NHibernate.UserTypes;
33using libsecondlife;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
@@ -67,7 +67,7 @@ namespace OpenSim.Data.NHibernate
67 get { return false; } 67 get { return false; }
68 } 68 }
69 69
70 public object NullSafeGet(System.Data.IDataReader rs, string[] names, object owner) 70 public object NullSafeGet(IDataReader rs, string[] names, object owner)
71 { 71 {
72 object uuid = null; 72 object uuid = null;
73 73
@@ -81,7 +81,7 @@ namespace OpenSim.Data.NHibernate
81 return uuid; 81 return uuid;
82 } 82 }
83 83
84 public void NullSafeSet(System.Data.IDbCommand cmd, object obj, int index) 84 public void NullSafeSet(IDbCommand cmd, object obj, int index)
85 { 85 {
86 LLUUID uuid = (LLUUID)obj; 86 LLUUID uuid = (LLUUID)obj;
87 ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString(); 87 ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString();
diff --git a/OpenSim/Data/OpenSimDataReader.cs b/OpenSim/Data/OpenSimDataReader.cs
index aaf9aaf..cb613c1 100644
--- a/OpenSim/Data/OpenSimDataReader.cs
+++ b/OpenSim/Data/OpenSimDataReader.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.Data; 28using System.Data;
30using libsecondlife; 29using libsecondlife;
31using OpenSim.Data.Base; 30using OpenSim.Data.Base;
diff --git a/OpenSim/Data/OpenSimDatabaseConnector.cs b/OpenSim/Data/OpenSimDatabaseConnector.cs
index 1a998a7..ee54f4f 100644
--- a/OpenSim/Data/OpenSimDatabaseConnector.cs
+++ b/OpenSim/Data/OpenSimDatabaseConnector.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System.Data; 28using System.Data;
29using System.Data.Common;
30using libsecondlife; 29using libsecondlife;
31
32using OpenSim.Data.Base; 30using OpenSim.Data.Base;
33 31
34namespace OpenSim.Data 32namespace OpenSim.Data
diff --git a/OpenSim/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Data/OpenSimObjectFieldMapper.cs
index 72bfbb1..d67881b 100644
--- a/OpenSim/Data/OpenSimObjectFieldMapper.cs
+++ b/OpenSim/Data/OpenSimObjectFieldMapper.cs
@@ -28,9 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data.Common; 30using System.Data.Common;
31using System.Text;
32using libsecondlife; 31using libsecondlife;
33
34using OpenSim.Data.Base; 32using OpenSim.Data.Base;
35 33
36namespace OpenSim.Data 34namespace OpenSim.Data
diff --git a/OpenSim/Data/OpenSimTableMapper.cs b/OpenSim/Data/OpenSimTableMapper.cs
index bf45b71..f09ef7d 100644
--- a/OpenSim/Data/OpenSimTableMapper.cs
+++ b/OpenSim/Data/OpenSimTableMapper.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.Data;
29
30using OpenSim.Data.Base; 28using OpenSim.Data.Base;
31 29
32namespace OpenSim.Data 30namespace OpenSim.Data
diff --git a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
index a946fe6..fe49978 100644
--- a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
+++ b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
@@ -26,9 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework;
30using OpenSim.Data.Base;
31using libsecondlife; 29using libsecondlife;
30using OpenSim.Data.Base;
31using OpenSim.Framework;
32 32
33namespace OpenSim.Data 33namespace OpenSim.Data
34{ 34{
diff --git a/OpenSim/Data/ReservationData.cs b/OpenSim/Data/ReservationData.cs
index e284708..43fb299 100644
--- a/OpenSim/Data/ReservationData.cs
+++ b/OpenSim/Data/ReservationData.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 System;
28using libsecondlife; 29using libsecondlife;
29 30
30namespace OpenSim.Data 31namespace OpenSim.Data
@@ -37,11 +38,11 @@ namespace OpenSim.Data
37 public int reservationMaxX = 65536; 38 public int reservationMaxX = 65536;
38 public int reservationMaxY = 65536; 39 public int reservationMaxY = 65536;
39 40
40 public string reservationName = System.String.Empty; 41 public string reservationName = String.Empty;
41 public string reservationCompany = System.String.Empty; 42 public string reservationCompany = String.Empty;
42 public bool status = true; 43 public bool status = true;
43 44
44 public string gridSendKey = System.String.Empty; 45 public string gridSendKey = String.Empty;
45 public string gridRecvKey = System.String.Empty; 46 public string gridRecvKey = String.Empty;
46 } 47 }
47} 48}
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 25a127b..2b63d2b 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -29,9 +29,9 @@ using System;
29using System.Data; 29using System.Data;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
37{ 37{
@@ -40,7 +40,7 @@ namespace OpenSim.Data.SQLite
40 /// </summary> 40 /// </summary>
41 public class SQLiteAssetData : AssetDataBase 41 public class SQLiteAssetData : AssetDataBase
42 { 42 {
43 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);
44 44
45 /// <summary> 45 /// <summary>
46 /// The database manager 46 /// The database manager
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 4ccea59..442ba39 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -30,15 +30,15 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using libsecondlife;
33using log4net;
33using Mono.Data.SqliteClient; 34using Mono.Data.SqliteClient;
34using OpenSim.Framework; 35using OpenSim.Framework;
35using OpenSim.Framework.Console;
36 36
37namespace OpenSim.Data.SQLite 37namespace OpenSim.Data.SQLite
38{ 38{
39 public class SQLiteInventoryStore : SQLiteUtil, IInventoryData 39 public class SQLiteInventoryStore : SQLiteUtil, IInventoryData
40 { 40 {
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 private const string invItemsSelect = "select * from inventoryitems"; 43 private const string invItemsSelect = "select * from inventoryitems";
44 private const string invFoldersSelect = "select * from inventoryfolders"; 44 private const string invFoldersSelect = "select * from inventoryfolders";
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index c8ba2af..66ce6ab 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -29,15 +29,15 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SQLite; 31using System.Data.SQLite;
32using System.Reflection;
32using libsecondlife; 33using libsecondlife;
33using Mono.Data.SqliteClient; 34using log4net;
34using OpenSim.Framework.Console;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
37{ 37{
38 internal class SQLiteManager : SQLiteUtil 38 internal class SQLiteManager : SQLiteUtil
39 { 39 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 private IDbConnection dbcon; 42 private IDbConnection dbcon;
43 43
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 85617e5..4355033 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -29,10 +29,11 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.IO; 31using System.IO;
32using System.Reflection;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using Mono.Data.SqliteClient; 35using Mono.Data.SqliteClient;
34using OpenSim.Framework; 36using OpenSim.Framework;
35using OpenSim.Framework.Console;
36using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
38 39
@@ -40,7 +41,7 @@ namespace OpenSim.Data.SQLite
40{ 41{
41 public class SQLiteRegionData : IRegionDataStore 42 public class SQLiteRegionData : IRegionDataStore
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 private const string primSelect = "select * from prims"; 46 private const string primSelect = "select * from prims";
46 private const string shapeSelect = "select * from primshapes"; 47 private const string shapeSelect = "select * from primshapes";
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 089c9df..97797e0 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
33using log4net;
32using Mono.Data.SqliteClient; 34using Mono.Data.SqliteClient;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.SQLite 37namespace OpenSim.Data.SQLite
37{ 38{
@@ -40,7 +41,7 @@ namespace OpenSim.Data.SQLite
40 /// </summary> 41 /// </summary>
41 public class SQLiteUserData : UserDataBase 42 public class SQLiteUserData : UserDataBase
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// The database manager 47 /// The database manager
@@ -238,9 +239,9 @@ namespace OpenSim.Data.SQLite
238 } 239 }
239 240
240 241
241 override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 242 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
242 { 243 {
243 List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>(); 244 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
244 string[] querysplit; 245 string[] querysplit;
245 querysplit = query.Split(' '); 246 querysplit = query.Split(' ');
246 if (querysplit.Length == 2) 247 if (querysplit.Length == 2)
@@ -254,7 +255,7 @@ namespace OpenSim.Data.SQLite
254 { 255 {
255 while (reader.Read()) 256 while (reader.Read())
256 { 257 {
257 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 258 AvatarPickerAvatar user = new AvatarPickerAvatar();
258 user.AvatarID = new LLUUID((string) reader["UUID"]); 259 user.AvatarID = new LLUUID((string) reader["UUID"]);
259 user.firstName = (string) reader["username"]; 260 user.firstName = (string) reader["username"];
260 user.lastName = (string) reader["surname"]; 261 user.lastName = (string) reader["surname"];
@@ -275,7 +276,7 @@ namespace OpenSim.Data.SQLite
275 { 276 {
276 while (reader.Read()) 277 while (reader.Read())
277 { 278 {
278 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 279 AvatarPickerAvatar user = new AvatarPickerAvatar();
279 user.AvatarID = new LLUUID((string) reader["UUID"]); 280 user.AvatarID = new LLUUID((string) reader["UUID"]);
280 user.firstName = (string) reader["username"]; 281 user.firstName = (string) reader["username"];
281 user.lastName = (string) reader["surname"]; 282 user.lastName = (string) reader["surname"];
@@ -766,7 +767,7 @@ namespace OpenSim.Data.SQLite
766 767
767 pcmd.ExecuteNonQuery(); 768 pcmd.ExecuteNonQuery();
768 } 769 }
769 catch (System.Exception) 770 catch (Exception)
770 { 771 {
771 m_log.Info("[USERS]: users table already exists"); 772 m_log.Info("[USERS]: users table already exists");
772 } 773 }
@@ -775,7 +776,7 @@ namespace OpenSim.Data.SQLite
775 { 776 {
776 fcmd.ExecuteNonQuery(); 777 fcmd.ExecuteNonQuery();
777 } 778 }
778 catch (System.Exception) 779 catch (Exception)
779 { 780 {
780 m_log.Info("[USERS]: userfriends table already exists"); 781 m_log.Info("[USERS]: userfriends table already exists");
781 } 782 }
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index ff9f6df..7ce4bd4 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -52,6 +52,6 @@ namespace OpenSim.Data
52 public abstract string GetVersion(); 52 public abstract string GetVersion();
53 public abstract string getName(); 53 public abstract string getName();
54 public abstract void Initialise(); 54 public abstract void Initialise();
55 public abstract List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); 55 public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
56 } 56 }
57} 57}
diff --git a/OpenSim/Framework/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs
index 916cdf8..ef3ad16 100644
--- a/OpenSim/Framework/AgentInventory.cs
+++ b/OpenSim/Framework/AgentInventory.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 System;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using libsecondlife; 30using libsecondlife;
30using libsecondlife.Packets; 31using libsecondlife.Packets;
@@ -230,7 +231,7 @@ namespace OpenSim.Framework
230 public LLUUID CreatorID; 231 public LLUUID CreatorID;
231 public sbyte InvType; 232 public sbyte InvType;
232 public sbyte Type; 233 public sbyte Type;
233 public string Name = System.String.Empty; 234 public string Name = String.Empty;
234 public string Description; 235 public string Description;
235 236
236 public InventoryItem() 237 public InventoryItem()
@@ -241,7 +242,7 @@ namespace OpenSim.Framework
241 public string ExportString() 242 public string ExportString()
242 { 243 {
243 string typ = "notecard"; 244 string typ = "notecard";
244 string result = System.String.Empty; 245 string result = String.Empty;
245 result += "\tinv_object\t0\n\t{\n"; 246 result += "\tinv_object\t0\n\t{\n";
246 result += "\t\tobj_id\t%s\n"; 247 result += "\t\tobj_id\t%s\n";
247 result += "\t\tparent_id\t" + ItemID.ToString() + "\n"; 248 result += "\t\tparent_id\t" + ItemID.ToString() + "\n";
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index 8a4ce92..6f43693 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework.Console;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 4afea42..0cc10c4 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -28,14 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection;
31using System.Xml; 32using System.Xml;
32
33using libsecondlife; 33using libsecondlife;
34using log4net;
34using Nini.Config; 35using Nini.Config;
35 36
36using OpenSim.Framework;
37using OpenSim.Framework.Console;
38
39/// <summary> 37/// <summary>
40/// 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.
41/// </summary> 39/// </summary>
@@ -43,7 +41,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
43{ 41{
44 public class AssetLoaderFileSystem : IAssetLoader 42 public class AssetLoaderFileSystem : IAssetLoader
45 { 43 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 45
48 protected AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage) 46 protected AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage)
49 { 47 {
diff --git a/OpenSim/Framework/AvatarPickerAvatar.cs b/OpenSim/Framework/AvatarPickerAvatar.cs
index 2a60a8e..26a5bb2 100644
--- a/OpenSim/Framework/AvatarPickerAvatar.cs
+++ b/OpenSim/Framework/AvatarPickerAvatar.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 libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index b800030..cd5f7f6 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.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 libsecondlife;
29using System; 28using System;
30using System.Runtime.Serialization; 29using System.Runtime.Serialization;
31using System.Security.Permissions; 30using System.Security.Permissions;
31using libsecondlife;
32 32
33namespace OpenSim.Framework 33namespace OpenSim.Framework
34{ 34{
@@ -77,7 +77,7 @@ namespace OpenSim.Framework
77 //System.Console.WriteLine("AvatarWearable Deserialize BGN"); 77 //System.Console.WriteLine("AvatarWearable Deserialize BGN");
78 if (info == null) 78 if (info == null)
79 { 79 {
80 throw new System.ArgumentNullException("info"); 80 throw new ArgumentNullException("info");
81 } 81 }
82 82
83 AssetID = new LLUUID((Guid)info.GetValue("AssetID", typeof(Guid))); 83 AssetID = new LLUUID((Guid)info.GetValue("AssetID", typeof(Guid)));
@@ -93,7 +93,7 @@ namespace OpenSim.Framework
93 { 93 {
94 if (info == null) 94 if (info == null)
95 { 95 {
96 throw new System.ArgumentNullException("info"); 96 throw new ArgumentNullException("info");
97 } 97 }
98 98
99 info.AddValue("AssetID", AssetID.UUID); 99 info.AddValue("AssetID", AssetID.UUID);
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 40c04c3..160d5b6 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -27,8 +27,10 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
31using libsecondlife.Packets; 32using libsecondlife.Packets;
33using log4net;
32 34
33namespace OpenSim.Framework 35namespace OpenSim.Framework
34{ 36{
@@ -36,7 +38,7 @@ namespace OpenSim.Framework
36 38
37 public class ClientManager 39 public class ClientManager
38 { 40 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 42
41 private Dictionary<uint, IClientAPI> m_clients; 43 private Dictionary<uint, IClientAPI> m_clients;
42 44
@@ -56,7 +58,7 @@ namespace OpenSim.Framework
56 { 58 {
57 whatToDo(LocalClients[i]); 59 whatToDo(LocalClients[i]);
58 } 60 }
59 catch (System.Exception e) 61 catch (Exception e)
60 { 62 {
61 m_log.Warn("[CLIENT]: Unable to do ForEachClient for one of the clients" + "\n Reason: " + e.ToString()); 63 m_log.Warn("[CLIENT]: Unable to do ForEachClient for one of the clients" + "\n Reason: " + e.ToString());
62 } 64 }
@@ -129,7 +131,7 @@ namespace OpenSim.Framework
129 client.Close(false); 131 client.Close(false);
130 } 132 }
131 } 133 }
132 catch (System.Exception e) 134 catch (Exception e)
133 { 135 {
134 m_log.Error(string.Format("[CLIENT]: Unable to shutdown circuit for: {0}\n Reason: {1}", agentId, e)); 136 m_log.Error(string.Format("[CLIENT]: Unable to shutdown circuit for: {0}\n Reason: {1}", agentId, e));
135 } 137 }
diff --git a/OpenSim/Framework/Communications/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs
index 133ba0d..caf96ff 100644
--- a/OpenSim/Framework/Communications/CAPSService.cs
+++ b/OpenSim/Framework/Communications/CAPSService.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 System;
28using OpenSim.Framework.Servers; 29using OpenSim.Framework.Servers;
29 30
30namespace OpenSim.Framework.Communications 31namespace OpenSim.Framework.Communications
@@ -47,7 +48,7 @@ namespace OpenSim.Framework.Communications
47 public string CapsRequest(string request, string path, string param) 48 public string CapsRequest(string request, string path, string param)
48 { 49 {
49 System.Console.WriteLine("new caps request " + request + " from path " + path); 50 System.Console.WriteLine("new caps request " + request + " from path " + path);
50 return System.String.Empty; 51 return String.Empty;
51 } 52 }
52 } 53 }
53} 54}
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 4d37e74..c81ea35 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -27,11 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using System.Threading; 31using System.Threading;
31using libsecondlife; 32using libsecondlife;
32using libsecondlife.Packets; 33using libsecondlife.Packets;
33 34using log4net;
34using OpenSim.Framework.Console;
35using OpenSim.Framework.Statistics; 35using OpenSim.Framework.Statistics;
36 36
37namespace OpenSim.Framework.Communications.Cache 37namespace OpenSim.Framework.Communications.Cache
@@ -52,8 +52,8 @@ namespace OpenSim.Framework.Communications.Cache
52 /// </summary> 52 /// </summary>
53 public class AssetCache : IAssetReceiver 53 public class AssetCache : IAssetReceiver
54 { 54 {
55 private static readonly log4net.ILog m_log 55 private static readonly ILog m_log
56 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 56 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
57 57
58 /// <summary> 58 /// <summary>
59 /// The cache of assets. This does not include textures. 59 /// The cache of assets. This does not include textures.
@@ -170,7 +170,7 @@ namespace OpenSim.Framework.Communications.Cache
170 m_assetCacheThread.Name = "AssetCacheThread"; 170 m_assetCacheThread.Name = "AssetCacheThread";
171 m_assetCacheThread.IsBackground = true; 171 m_assetCacheThread.IsBackground = true;
172 m_assetCacheThread.Start(); 172 m_assetCacheThread.Start();
173 OpenSim.Framework.ThreadTracker.Add(m_assetCacheThread); 173 ThreadTracker.Add(m_assetCacheThread);
174 } 174 }
175 175
176 /// <summary> 176 /// <summary>
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index 3ce28c2..891fa6d 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -25,16 +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 */
27using System.IO; 27using System.IO;
28using System.Reflection;
28using Db4objects.Db4o; 29using Db4objects.Db4o;
29using Db4objects.Db4o.Query; 30using Db4objects.Db4o.Query;
30using libsecondlife; 31using libsecondlife;
31using OpenSim.Framework.Console; 32using log4net;
32 33
33namespace OpenSim.Framework.Communications.Cache 34namespace OpenSim.Framework.Communications.Cache
34{ 35{
35 public class LocalAssetServer : AssetServerBase 36 public class LocalAssetServer : AssetServerBase
36 { 37 {
37 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 39
39 private IObjectContainer db; 40 private IObjectContainer db;
40 41
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 261b697..1a7f872 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -26,18 +26,18 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Reflection;
30using System.Threading; 30using System.Threading;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework.Console; 32using log4net;
33using OpenSim.Framework.AssetLoader.Filesystem; 33using OpenSim.Framework.AssetLoader.Filesystem;
34 34
35namespace OpenSim.Framework.Communications.Cache 35namespace OpenSim.Framework.Communications.Cache
36{ 36{
37 public abstract class AssetServerBase : IAssetServer 37 public abstract class AssetServerBase : IAssetServer
38 { 38 {
39 private static readonly log4net.ILog m_log 39 private static readonly ILog m_log
40 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 protected IAssetReceiver m_receiver; 42 protected IAssetReceiver m_receiver;
43 protected BlockingQueue<AssetRequest> m_assetRequests; 43 protected BlockingQueue<AssetRequest> m_assetRequests;
@@ -100,7 +100,7 @@ namespace OpenSim.Framework.Communications.Cache
100 m_localAssetServerThread.Name = "LocalAssetServerThread"; 100 m_localAssetServerThread.Name = "LocalAssetServerThread";
101 m_localAssetServerThread.IsBackground = true; 101 m_localAssetServerThread.IsBackground = true;
102 m_localAssetServerThread.Start(); 102 m_localAssetServerThread.Start();
103 OpenSim.Framework.ThreadTracker.Add(m_localAssetServerThread); 103 ThreadTracker.Add(m_localAssetServerThread);
104 } 104 }
105 105
106 private void RunRequests() 106 private void RunRequests()
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index ec5717e..a245af1 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -27,8 +27,9 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32 33
33namespace OpenSim.Framework.Communications.Cache 34namespace OpenSim.Framework.Communications.Cache
34{ 35{
@@ -37,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache
37 /// </summary> 38 /// </summary>
38 public class CachedUserInfo 39 public class CachedUserInfo
39 { 40 {
40 private static readonly log4net.ILog m_log 41 private static readonly ILog m_log
41 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 43
43 /// <summary> 44 /// <summary>
44 /// The comms manager holds references to services (user, grid, inventory, etc.) 45 /// The comms manager holds references to services (user, grid, inventory, etc.)
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index 3e703d2..d5b7fea 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -27,15 +27,16 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection;
30using System.Xml.Serialization; 31using System.Xml.Serialization;
31using OpenSim.Framework.Console; 32using log4net;
32using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
33 34
34namespace OpenSim.Framework.Communications.Cache 35namespace OpenSim.Framework.Communications.Cache
35{ 36{
36 public class GridAssetClient : AssetServerBase 37 public class GridAssetClient : AssetServerBase
37 { 38 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 40
40 private string _assetServerUrl; 41 private string _assetServerUrl;
41 42
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 03036d0..a39738d 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection;
31using System.Xml; 32using System.Xml;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using Nini.Config; 35using Nini.Config;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Framework.Communications.Cache 37namespace OpenSim.Framework.Communications.Cache
37{ 38{
@@ -41,7 +42,7 @@ namespace OpenSim.Framework.Communications.Cache
41 /// </summary> 42 /// </summary>
42 public class LibraryRootFolder : InventoryFolderImpl 43 public class LibraryRootFolder : InventoryFolderImpl
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000"); 47 private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000");
47 48
@@ -153,13 +154,13 @@ namespace OpenSim.Framework.Communications.Cache
153 { 154 {
154 string foldersPath 155 string foldersPath
155 = Path.Combine( 156 = Path.Combine(
156 Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty)); 157 Util.inventoryDir(), config.GetString("foldersFile", String.Empty));
157 158
158 LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); 159 LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig);
159 160
160 string itemsPath 161 string itemsPath
161 = Path.Combine( 162 = Path.Combine(
162 Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty)); 163 Util.inventoryDir(), config.GetString("itemsFile", String.Empty));
163 164
164 LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); 165 LoadFromFile(itemsPath, "Library items", ReadItemFromConfig);
165 } 166 }
@@ -209,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache
209 item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); 210 item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString()));
210 item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); 211 item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString()));
211 item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); 212 item.Folder = new LLUUID(config.GetString("folderID", ID.ToString()));
212 item.Description = config.GetString("description", System.String.Empty); 213 item.Description = config.GetString("description", String.Empty);
213 item.Name = config.GetString("name", System.String.Empty); 214 item.Name = config.GetString("name", String.Empty);
214 item.AssetType = config.GetInt("assetType", 0); 215 item.AssetType = config.GetInt("assetType", 0);
215 item.InvType = config.GetInt("inventoryType", 0); 216 item.InvType = config.GetInt("inventoryType", 0);
216 item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); 217 item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF);
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 4f1a304..1afec70 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -27,13 +27,13 @@
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using OpenSim.Framework.Console; 30using log4net;
31 31
32namespace OpenSim.Framework.Communications.Cache 32namespace OpenSim.Framework.Communications.Cache
33{ 33{
34 public class SQLAssetServer : AssetServerBase 34 public class SQLAssetServer : AssetServerBase
35 { 35 {
36 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 36 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 37
38 public SQLAssetServer(string pluginName) 38 public SQLAssetServer(string pluginName)
39 { 39 {
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 9813756..bf8ff40 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.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;
29using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
30using System.Threading; 30using System.Threading;
31
32using libsecondlife; 31using libsecondlife;
33 32using log4net;
34using OpenSim.Framework.Console;
35 33
36namespace OpenSim.Framework.Communications.Cache 34namespace OpenSim.Framework.Communications.Cache
37{ 35{
@@ -40,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache
40 /// </summary> 38 /// </summary>
41 public class UserProfileCacheService 39 public class UserProfileCacheService
42 { 40 {
43 private static readonly log4net.ILog m_log 41 private static readonly ILog m_log
44 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 43
46 /// <summary> 44 /// <summary>
47 /// The comms manager holds references to services (user, grid, inventory, etc.) 45 /// The comms manager holds references to services (user, grid, inventory, etc.)
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 2eff9c2..c07744c 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -29,12 +29,11 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32 32using System.Reflection;
33using libsecondlife; 33using libsecondlife;
34 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
39 38
40namespace OpenSim.Region.Capabilities 39namespace OpenSim.Region.Capabilities
@@ -66,8 +65,8 @@ namespace OpenSim.Region.Capabilities
66 65
67 public class Caps 66 public class Caps
68 { 67 {
69 private static readonly log4net.ILog m_log = 68 private static readonly ILog m_log =
70 log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 69 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
71 70
72 private string m_httpListenerHostName; 71 private string m_httpListenerHostName;
73 private uint m_httpListenPort; 72 private uint m_httpListenPort;
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
index 6992bd1..3e3ae16 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
@@ -25,14 +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; 28using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.IO;
32using libsecondlife;
33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Servers; 30using OpenSim.Framework.Servers;
37 31
38namespace OpenSim.Region.Capabilities 32namespace OpenSim.Region.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index 876b8d3..1393523 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.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 libsecondlife;
29using System; 28using System;
29using libsecondlife;
30 30
31namespace OpenSim.Region.Capabilities 31namespace OpenSim.Region.Capabilities
32{ 32{
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index fb64c75..e71a73e 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.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 System;
28using libsecondlife; 29using libsecondlife;
29 30
30namespace OpenSim.Region.Capabilities 31namespace OpenSim.Region.Capabilities
@@ -32,11 +33,11 @@ namespace OpenSim.Region.Capabilities
32 [LLSDMap] 33 [LLSDMap]
33 public class LLSDAssetUploadRequest 34 public class LLSDAssetUploadRequest
34 { 35 {
35 public string asset_type = System.String.Empty; 36 public string asset_type = String.Empty;
36 public string description = System.String.Empty; 37 public string description = String.Empty;
37 public LLUUID folder_id = LLUUID.Zero; 38 public LLUUID folder_id = LLUUID.Zero;
38 public string inventory_type = System.String.Empty; 39 public string inventory_type = String.Empty;
39 public string name = System.String.Empty; 40 public string name = String.Empty;
40 41
41 public LLSDAssetUploadRequest() 42 public LLSDAssetUploadRequest()
42 { 43 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index fb721f0..bb293ba 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -25,13 +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;
29
28namespace OpenSim.Region.Capabilities 30namespace OpenSim.Region.Capabilities
29{ 31{
30 [LLSDMap] 32 [LLSDMap]
31 public class LLSDAssetUploadResponse 33 public class LLSDAssetUploadResponse
32 { 34 {
33 public string uploader = System.String.Empty; 35 public string uploader = String.Empty;
34 public string state = System.String.Empty; 36 public string state = String.Empty;
35 37
36 public LLSDAssetUploadResponse() 38 public LLSDAssetUploadResponse()
37 { 39 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
index 36a2cbf..d402579 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.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 libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Region.Capabilities 30namespace OpenSim.Region.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
index 4fb0544..4439346 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
@@ -27,7 +27,6 @@
27*/ 27*/
28 28
29using System.Collections; 29using System.Collections;
30using libsecondlife;
31 30
32namespace OpenSim.Region.Capabilities 31namespace OpenSim.Region.Capabilities
33{ 32{
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
index 8a18213..941e70e 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
@@ -26,8 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using libsecondlife;
30
31namespace OpenSim.Region.Capabilities 29namespace OpenSim.Region.Capabilities
32{ 30{
33 [LLSDMap] 31 [LLSDMap]
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 192c8e3..ee0d164 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -27,7 +27,9 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
32using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
33using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
@@ -36,7 +38,7 @@ namespace OpenSim.Framework.Communications
36{ 38{
37 public class CommunicationsManager 39 public class CommunicationsManager
38 { 40 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 42
41 protected IUserService m_userService; 43 protected IUserService m_userService;
42 44
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 5e7f855..90bda01 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29
30using libsecondlife; 29using libsecondlife;
31
32using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
33 31
34namespace OpenSim.Framework.Communications 32namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index d4e7539..f614e7d 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -29,14 +29,14 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework.Console; 32using log4net;
33 33
34namespace OpenSim.Framework.Communications 34namespace OpenSim.Framework.Communications
35{ 35{
36 public abstract class InventoryServiceBase : IInventoryServices 36 public abstract class InventoryServiceBase : IInventoryServices
37 { 37 {
38 private static readonly log4net.ILog m_log 38 private static readonly ILog m_log
39 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 40
41 protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>(); 41 protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>();
42 42
diff --git a/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs
index ded9ffc..6ec21d9 100644
--- a/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs
+++ b/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.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.Framework.Communications.Limit 28namespace OpenSim.Framework.Communications.Limit
31{ 29{
32 /// <summary> 30 /// <summary>
diff --git a/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs
index 43b77a7..72d0586 100644
--- a/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs
+++ b/OpenSim/Framework/Communications/Limit/NullLimitStrategy.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.Framework.Communications.Limit 28namespace OpenSim.Framework.Communications.Limit
31{ 29{
32 /// <summary> 30 /// <summary>
diff --git a/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs
index 85ff2bd..dfa05fa 100644
--- a/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs
+++ b/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.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;
30 29
31namespace OpenSim.Framework.Communications.Limit 30namespace OpenSim.Framework.Communications.Limit
diff --git a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs
index b2b4f14..34b01ff 100644
--- a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs
+++ b/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Framework.Communications.Limit
104 { 104 {
105 if (!IsMonitoringRequests(id)) 105 if (!IsMonitoringRequests(id))
106 { 106 {
107 requests.Add(id, new Request(System.DateTime.Now)); 107 requests.Add(id, new Request(DateTime.Now));
108 } 108 }
109 } 109 }
110 110
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 1b88d10..a379253 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
32using libsecondlife.StructuredData; 33using libsecondlife.StructuredData;
34using log4net;
33using Nwc.XmlRpc; 35using Nwc.XmlRpc;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Framework.UserManagement 37namespace OpenSim.Framework.UserManagement
37{ 38{
@@ -41,7 +42,7 @@ namespace OpenSim.Framework.UserManagement
41 /// </summary> 42 /// </summary>
42 public class LoginResponse 43 public class LoginResponse
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 private Hashtable loginFlagsHash; 47 private Hashtable loginFlagsHash;
47 private Hashtable globalTexturesHash; 48 private Hashtable globalTexturesHash;
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index ce8aa23..d656559 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -29,21 +29,22 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection;
32using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
33using System.Threading; 34using System.Threading;
35using System.Web;
34using libsecondlife; 36using libsecondlife;
35using libsecondlife.StructuredData; 37using libsecondlife.StructuredData;
38using log4net;
36using Nwc.XmlRpc; 39using Nwc.XmlRpc;
37
38using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
39using OpenSim.Framework.Console;
40using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
41 42
42namespace OpenSim.Framework.UserManagement 43namespace OpenSim.Framework.UserManagement
43{ 44{
44 public abstract class LoginService 45 public abstract class LoginService
45 { 46 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 48
48 protected string m_welcomeMessage = "Welcome to OpenSim"; 49 protected string m_welcomeMessage = "Welcome to OpenSim";
49 protected UserManagerBase m_userManager = null; 50 protected UserManagerBase m_userManager = null;
@@ -159,7 +160,7 @@ namespace OpenSim.Framework.UserManagement
159 { 160 {
160 webloginkey = new LLUUID((string)requestData["web_login_key"]); 161 webloginkey = new LLUUID((string)requestData["web_login_key"]);
161 } 162 }
162 catch (System.Exception e) 163 catch (Exception e)
163 { 164 {
164 m_log.InfoFormat( 165 m_log.InfoFormat(
165 "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}", 166 "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}",
@@ -514,7 +515,7 @@ namespace OpenSim.Framework.UserManagement
514 statuscode = 301; 515 statuscode = 301;
515 516
516 string redirectURL = "about:blank?redirect-http-hack=" + 517 string redirectURL = "about:blank?redirect-http-hack=" +
517 System.Web.HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + 518 HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
518 lastname + 519 lastname +
519 "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString()); 520 "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString());
520 //m_log.Info("[WEB]: R:" + redirectURL); 521 //m_log.Info("[WEB]: R:" + redirectURL);
diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs
index 1178fed..5463134 100644
--- a/OpenSim/Framework/Communications/RestClient/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs
@@ -29,10 +29,11 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net; 31using System.Net;
32using System.Reflection;
32using System.Text; 33using System.Text;
33using System.Threading; 34using System.Threading;
34using System.Web; 35using System.Web;
35using OpenSim.Framework.Console; 36using log4net;
36 37
37namespace OpenSim.Framework.Communications 38namespace OpenSim.Framework.Communications
38{ 39{
@@ -55,7 +56,7 @@ namespace OpenSim.Framework.Communications
55 /// </remarks> 56 /// </remarks>
56 public class RestClient 57 public class RestClient
57 { 58 {
58 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 59 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
59 60
60 private string realuri; 61 private string realuri;
61 62
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index c86992a..0f7dc44 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -32,8 +32,8 @@ using System.Reflection;
32using System.Security.Cryptography; 32using System.Security.Cryptography;
33using libsecondlife; 33using libsecondlife;
34using libsecondlife.StructuredData; 34using libsecondlife.StructuredData;
35using log4net;
35using Nwc.XmlRpc; 36using Nwc.XmlRpc;
36using OpenSim.Framework.Console;
37using OpenSim.Framework.Statistics; 37using OpenSim.Framework.Statistics;
38 38
39namespace OpenSim.Framework.UserManagement 39namespace OpenSim.Framework.UserManagement
@@ -43,8 +43,8 @@ namespace OpenSim.Framework.UserManagement
43 /// </summary> 43 /// </summary>
44 public abstract class UserManagerBase : IUserService 44 public abstract class UserManagerBase : IUserService
45 { 45 {
46 private static readonly log4net.ILog m_log 46 private static readonly ILog m_log
47 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 public UserConfig _config; 49 public UserConfig _config;
50 private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>(); 50 private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
diff --git a/OpenSim/Framework/Communications/XMPP/Stanza.cs b/OpenSim/Framework/Communications/XMPP/Stanza.cs
index 5675a47..3930bac 100644
--- a/OpenSim/Framework/Communications/XMPP/Stanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/Stanza.cs
@@ -26,8 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Xml; 29using System.Xml;
32 30
33namespace OpenSim.Framework.Communications.XMPP 31namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XMPPParser.cs b/OpenSim/Framework/Communications/XMPP/XMPPParser.cs
index e41df26..26a78b2 100644
--- a/OpenSim/Framework/Communications/XMPP/XMPPParser.cs
+++ b/OpenSim/Framework/Communications/XMPP/XMPPParser.cs
@@ -25,12 +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;
32using OpenSim.Framework;
33
34namespace OpenSim.Framework.Communications.XMPP 28namespace OpenSim.Framework.Communications.XMPP
35{ 29{
36 public class XMPPParser 30 public class XMPPParser
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index 1fb4866..e985c06 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -25,22 +25,24 @@
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.Net; 30using System.Net;
31using System.Reflection;
30using System.Text; 32using System.Text;
31using OpenSim.Framework.Console; 33using log4net;
32 34
33namespace OpenSim.Framework.Configuration.HTTP 35namespace OpenSim.Framework.Configuration.HTTP
34{ 36{
35 public class HTTPConfiguration : IGenericConfig 37 public class HTTPConfiguration : IGenericConfig
36 { 38 {
37 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 40
39 private RemoteConfigSettings remoteConfigSettings; 41 private RemoteConfigSettings remoteConfigSettings;
40 42
41 private XmlConfiguration xmlConfig; 43 private XmlConfiguration xmlConfig;
42 44
43 private string configFileName = System.String.Empty; 45 private string configFileName = String.Empty;
44 46
45 public HTTPConfiguration() 47 public HTTPConfiguration()
46 { 48 {
diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
index 88945ff..4e37ec6 100644
--- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
+++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
@@ -25,13 +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;
29
28namespace OpenSim.Framework.Configuration.HTTP 30namespace OpenSim.Framework.Configuration.HTTP
29{ 31{
30 public class RemoteConfigSettings 32 public class RemoteConfigSettings
31 { 33 {
32 private ConfigurationMember configMember; 34 private ConfigurationMember configMember;
33 35
34 public string baseConfigURL = System.String.Empty; 36 public string baseConfigURL = String.Empty;
35 37
36 public RemoteConfigSettings(string filename) 38 public RemoteConfigSettings(string filename)
37 { 39 {
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index c27a134..12590b4 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -32,13 +32,14 @@ using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Xml; 33using System.Xml;
34using libsecondlife; 34using libsecondlife;
35using log4net;
35using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
36 37
37namespace OpenSim.Framework 38namespace OpenSim.Framework
38{ 39{
39 public class ConfigurationMember 40 public class ConfigurationMember
40 { 41 {
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 43
43 public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result); 44 public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result);
44 45
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index ce95cb9..27ff340 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -28,14 +28,15 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics; 30using System.Diagnostics;
31using System.IO;
32using System.Net; 31using System.Net;
32using System.Reflection;
33using log4net;
33 34
34namespace OpenSim.Framework.Console 35namespace OpenSim.Framework.Console
35{ 36{
36 public class ConsoleBase 37 public class ConsoleBase
37 { 38 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 40
40 private readonly object m_syncRoot = new object(); 41 private readonly object m_syncRoot = new object();
41 42
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
index 542a03f..86df3c0 100644
--- a/OpenSim/Framework/Console/OpenSimAppender.cs
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -26,14 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Text;
30using System.Text.RegularExpressions; 29using System.Text.RegularExpressions;
31using System.Globalization;
32
33using log4net.Core;
34using log4net.Layout;
35using log4net.Appender; 30using log4net.Appender;
36using log4net.Util; 31using log4net.Core;
37 32
38namespace OpenSim.Framework.Console 33namespace OpenSim.Framework.Console
39{ 34{
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index 54baab9..66b0885 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.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.Framework 28namespace OpenSim.Framework
33{ 29{
34 public class Constants 30 public class Constants
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 49b36e9..98052fc 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -27,14 +27,15 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
31using OpenSim.Framework.Console; 32using log4net;
32 33
33namespace OpenSim.Framework 34namespace OpenSim.Framework
34{ 35{
35 public class EstateSettings 36 public class EstateSettings
36 { 37 {
37 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 39
39 //Settings to this island 40 //Settings to this island
40 private float m_billableFactor; 41 private float m_billableFactor;
diff --git a/OpenSim/Framework/FriendListItem.cs b/OpenSim/Framework/FriendListItem.cs
index 5a66683..9220705 100644
--- a/OpenSim/Framework/FriendListItem.cs
+++ b/OpenSim/Framework/FriendListItem.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.Generic;
30using libsecondlife; 28using libsecondlife;
31 29
32namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 9519f17..7ccd0c4 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework.Console;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index ef7abd1..77e5460 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
diff --git a/OpenSim/Framework/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs
index 5bbf435..23c0642 100644
--- a/OpenSim/Framework/IAssetServer.cs
+++ b/OpenSim/Framework/IAssetServer.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.Generic;
30using libsecondlife; 28using libsecondlife;
31 29
32namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/IInventoryData.cs b/OpenSim/Framework/IInventoryData.cs
index cfba135..6a500f8 100644
--- a/OpenSim/Framework/IInventoryData.cs
+++ b/OpenSim/Framework/IInventoryData.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.Collections;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Xml.Serialization;
31using libsecondlife; 29using libsecondlife;
32 30
33namespace OpenSim.Framework 31namespace OpenSim.Framework
diff --git a/OpenSim/Framework/InventoryCollection.cs b/OpenSim/Framework/InventoryCollection.cs
index abccf49..e5e8f62 100644
--- a/OpenSim/Framework/InventoryCollection.cs
+++ b/OpenSim/Framework/InventoryCollection.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.Collections;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Xml.Serialization;
31using libsecondlife; 29using libsecondlife;
32 30
33namespace OpenSim.Framework 31namespace OpenSim.Framework
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 7136efa..39a6930 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Framework.Console; 28using System;
29 29
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
@@ -34,12 +34,12 @@ namespace OpenSim.Framework
34 /// </summary> 34 /// </summary>
35 public class InventoryConfig 35 public class InventoryConfig
36 { 36 {
37 public string DefaultStartupMsg = System.String.Empty; 37 public string DefaultStartupMsg = String.Empty;
38 public string UserServerURL = System.String.Empty; 38 public string UserServerURL = String.Empty;
39 public string UserSendKey = System.String.Empty; 39 public string UserSendKey = String.Empty;
40 public string UserRecvKey = System.String.Empty; 40 public string UserRecvKey = String.Empty;
41 41
42 public string DatabaseProvider = System.String.Empty; 42 public string DatabaseProvider = String.Empty;
43 public static uint DefaultHttpPort = 8004; 43 public static uint DefaultHttpPort = 8004;
44 44
45 public uint HttpPort = DefaultHttpPort; 45 public uint HttpPort = DefaultHttpPort;
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index ee53307..8e276e9 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.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.Collections;
29using System.Collections.Generic;
30using System.Xml.Serialization;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 03b47ca..8c8d858 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.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.Collections;
29using System.Collections.Generic;
30using System.Xml.Serialization;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/JId.cs b/OpenSim/Framework/JId.cs
index a685807..dac4838 100644
--- a/OpenSim/Framework/JId.cs
+++ b/OpenSim/Framework/JId.cs
@@ -26,8 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework 30namespace OpenSim.Framework
33{ 31{
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index f154e5e..6d2c5d7 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.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.Collections.Generic;
29using System; 28using System;
29using System.Collections.Generic;
30using libsecondlife; 30using libsecondlife;
31 31
32namespace OpenSim.Framework 32namespace OpenSim.Framework
diff --git a/OpenSim/Framework/Login.cs b/OpenSim/Framework/Login.cs
index bc1e8d0..bc3375d 100644
--- a/OpenSim/Framework/Login.cs
+++ b/OpenSim/Framework/Login.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 System;
28using libsecondlife; 29using libsecondlife;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
@@ -39,7 +40,7 @@ namespace OpenSim.Framework
39 public LLUUID InventoryFolder; 40 public LLUUID InventoryFolder;
40 public LLUUID BaseFolder; 41 public LLUUID BaseFolder;
41 public uint CircuitCode; 42 public uint CircuitCode;
42 public string CapsPath = System.String.Empty; 43 public string CapsPath = String.Empty;
43 public LLVector3 StartPos; 44 public LLVector3 StartPos;
44 45
45 public Login() 46 public Login()
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index f15efa6..dbc06db 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -26,9 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Console;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
34{ 31{
@@ -69,7 +66,7 @@ namespace OpenSim.Framework
69 configMember.addConfigurationOption("default_user_server", 66 configMember.addConfigurationOption("default_user_server",
70 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 67 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
71 "Default User Server URI", 68 "Default User Server URI",
72 "http://127.0.0.1:" + MessageServerConfig.DefaultHttpPort.ToString() + "/", false); 69 "http://127.0.0.1:" + DefaultHttpPort.ToString() + "/", false);
73 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 70 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
74 "Key to send to user server", "null", false); 71 "Key to send to user server", "null", false);
75 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 72 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index df559fc..ee11924 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.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 Nini.Config;
29using System; 28using System;
29using Nini.Config;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 31548a0..22f952a 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -26,8 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Net;
30using System.Collections; 29using System.Collections;
30using System.Net;
31using libsecondlife;
31using libsecondlife.Packets; 32using libsecondlife.Packets;
32 33
33namespace OpenSim.Framework 34namespace OpenSim.Framework
@@ -115,13 +116,13 @@ namespace OpenSim.Framework
115 { 116 {
116 byte[] decoded_header = new byte[10 + 8]; 117 byte[] decoded_header = new byte[10 + 8];
117 ushort id; 118 ushort id;
118 libsecondlife.PacketFrequency freq; 119 PacketFrequency freq;
119 120
120 Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10); 121 Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10);
121 122
122 if((bytes[0] & libsecondlife.Helpers.MSG_ZEROCODED)!=0) 123 if((bytes[0] & Helpers.MSG_ZEROCODED)!=0)
123 { 124 {
124 libsecondlife.Helpers.ZeroDecodeCommand(bytes, decoded_header); 125 Helpers.ZeroDecodeCommand(bytes, decoded_header);
125 } 126 }
126 127
127 if (decoded_header[6] == 0xFF) 128 if (decoded_header[6] == 0xFF)
@@ -129,18 +130,18 @@ namespace OpenSim.Framework
129 if (decoded_header[7] == 0xFF) 130 if (decoded_header[7] == 0xFF)
130 { 131 {
131 id = (ushort)((decoded_header[8] << 8) + decoded_header[9]); 132 id = (ushort)((decoded_header[8] << 8) + decoded_header[9]);
132 freq = libsecondlife.PacketFrequency.Low; 133 freq = PacketFrequency.Low;
133 } 134 }
134 else 135 else
135 { 136 {
136 id = (ushort)decoded_header[7]; 137 id = (ushort)decoded_header[7];
137 freq = libsecondlife.PacketFrequency.Medium; 138 freq = PacketFrequency.Medium;
138 } 139 }
139 } 140 }
140 else 141 else
141 { 142 {
142 id = (ushort)decoded_header[6]; 143 id = (ushort)decoded_header[6];
143 freq = libsecondlife.PacketFrequency.High; 144 freq = PacketFrequency.High;
144 } 145 }
145 146
146 return Packet.GetType(id, freq); 147 return Packet.GetType(id, freq);
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index ee2079b..73971ac 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.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.Collections.Generic;
29using System; 28using System;
29using System.Collections.Generic;
30using libsecondlife; 30using libsecondlife;
31 31
32namespace OpenSim.Framework 32namespace OpenSim.Framework
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index f19f1db..20a2709 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -31,7 +31,6 @@ using System.Net.Sockets;
31using System.Xml; 31using System.Xml;
32using libsecondlife; 32using libsecondlife;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework.Console;
35 34
36namespace OpenSim.Framework 35namespace OpenSim.Framework
37{ 36{
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index ad8b4a0..cfaaf02 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.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 System;
28using System.IO; 29using System.IO;
29using Nini.Config; 30using Nini.Config;
30 31
@@ -48,7 +49,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
48 IniConfig startupConfig = (IniConfig)m_configSouce.Configs["Startup"]; 49 IniConfig startupConfig = (IniConfig)m_configSouce.Configs["Startup"];
49 regionConfigPath = startupConfig.GetString("regionload_regionsdir", regionConfigPath).Trim(); 50 regionConfigPath = startupConfig.GetString("regionload_regionsdir", regionConfigPath).Trim();
50 } 51 }
51 catch (System.Exception) 52 catch (Exception)
52 { 53 {
53 // No INI setting recorded. 54 // No INI setting recorded.
54 } 55 }
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index 098e305..17077e7 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -25,17 +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.IO; 29using System.IO;
29using System.Net; 30using System.Net;
31using System.Reflection;
30using System.Xml; 32using System.Xml;
33using log4net;
31using Nini.Config; 34using Nini.Config;
32using OpenSim.Framework.Console;
33 35
34namespace OpenSim.Framework.RegionLoader.Web 36namespace OpenSim.Framework.RegionLoader.Web
35{ 37{
36 public class RegionLoaderWebServer : IRegionLoader 38 public class RegionLoaderWebServer : IRegionLoader
37 { 39 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 41
40 private IniConfigSource m_configSouce; 42 private IniConfigSource m_configSouce;
41 43
@@ -54,8 +56,8 @@ namespace OpenSim.Framework.RegionLoader.Web
54 else 56 else
55 { 57 {
56 IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"]; 58 IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"];
57 string url = startupConfig.GetString("regionload_webserver_url", System.String.Empty).Trim(); 59 string url = startupConfig.GetString("regionload_webserver_url", String.Empty).Trim();
58 if (url == System.String.Empty) 60 if (url == String.Empty)
59 { 61 {
60 m_log.Error("[WEBLOADER]: Unable to load webserver URL - URL was empty."); 62 m_log.Error("[WEBLOADER]: Unable to load webserver URL - URL was empty.");
61 return null; 63 return null;
@@ -68,7 +70,7 @@ namespace OpenSim.Framework.RegionLoader.Web
68 HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse(); 70 HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
69 m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server..."); 71 m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server...");
70 StreamReader reader = new StreamReader(webResponse.GetResponseStream()); 72 StreamReader reader = new StreamReader(webResponse.GetResponseStream());
71 string xmlSource = System.String.Empty; 73 string xmlSource = String.Empty;
72 string tempStr = reader.ReadLine(); 74 string tempStr = reader.ReadLine();
73 while (tempStr != null) 75 while (tempStr != null)
74 { 76 {
diff --git a/OpenSim/Framework/RegionUpData.cs b/OpenSim/Framework/RegionUpData.cs
index c2a7763..6162171 100644
--- a/OpenSim/Framework/RegionUpData.cs
+++ b/OpenSim/Framework/RegionUpData.cs
@@ -26,8 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework 30namespace OpenSim.Framework
33{ 31{
diff --git a/OpenSim/Framework/SerializableInventory.cs b/OpenSim/Framework/SerializableInventory.cs
index 529f91e..8193fa7 100644
--- a/OpenSim/Framework/SerializableInventory.cs
+++ b/OpenSim/Framework/SerializableInventory.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System.Collections; 28using System.Collections;
29using System.Collections.Generic;
30using System.Xml.Serialization; 29using System.Xml.Serialization;
31using libsecondlife;
32 30
33namespace OpenSim.Framework 31namespace OpenSim.Framework
34{ 32{
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 00c81c8..7c268ed 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -30,18 +30,20 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Net; 32using System.Net;
33using System.Net.Sockets;
34using System.Reflection;
33using System.Text; 35using System.Text;
34using System.Threading; 36using System.Threading;
35using System.Xml; 37using System.Xml;
36using Nwc.XmlRpc;
37using libsecondlife.StructuredData; 38using libsecondlife.StructuredData;
38using OpenSim.Framework.Console; 39using log4net;
40using Nwc.XmlRpc;
39 41
40namespace OpenSim.Framework.Servers 42namespace OpenSim.Framework.Servers
41{ 43{
42 public class BaseHttpServer 44 public class BaseHttpServer
43 { 45 {
44 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);
45 47
46 protected Thread m_workerThread; 48 protected Thread m_workerThread;
47 protected HttpListener m_httpListener; 49 protected HttpListener m_httpListener;
@@ -199,7 +201,7 @@ namespace OpenSim.Framework.Servers
199 } 201 }
200 } 202 }
201 } 203 }
202 catch (System.Net.Sockets.SocketException e) 204 catch (SocketException e)
203 { 205 {
204 // At least on linux, it appears that if the client makes a request without requiring the response, 206 // At least on linux, it appears that if the client makes a request without requiring the response,
205 // an unconnected socket exception is thrown when we close the response output stream. There's no 207 // an unconnected socket exception is thrown when we close the response output stream. There's no
@@ -346,7 +348,7 @@ namespace OpenSim.Framework.Servers
346 { 348 {
347 response.OutputStream.Close(); 349 response.OutputStream.Close();
348 } 350 }
349 catch (System.Net.Sockets.SocketException) 351 catch (SocketException)
350 { 352 {
351 // This has to be here to prevent a Linux/Mono crash 353 // This has to be here to prevent a Linux/Mono crash
352 } 354 }
@@ -602,7 +604,7 @@ namespace OpenSim.Framework.Servers
602 m_workerThread.Name = "HttpThread"; 604 m_workerThread.Name = "HttpThread";
603 m_workerThread.IsBackground = true; 605 m_workerThread.IsBackground = true;
604 m_workerThread.Start(); 606 m_workerThread.Start();
605 OpenSim.Framework.ThreadTracker.Add(m_workerThread); 607 ThreadTracker.Add(m_workerThread);
606 } 608 }
607 609
608 private void StartHTTP() 610 private void StartHTTP()
diff --git a/OpenSim/Framework/Servers/GenericHTTPMethod.cs b/OpenSim/Framework/Servers/GenericHTTPMethod.cs
index f6bd65b..1358a00 100644
--- a/OpenSim/Framework/Servers/GenericHTTPMethod.cs
+++ b/OpenSim/Framework/Servers/GenericHTTPMethod.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/MessageServerInfo.cs b/OpenSim/Framework/Servers/MessageServerInfo.cs
index 9bcd4e1..17b5f10 100644
--- a/OpenSim/Framework/Servers/MessageServerInfo.cs
+++ b/OpenSim/Framework/Servers/MessageServerInfo.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;
31 29
32namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
33{ 31{
diff --git a/OpenSim/Framework/Statistics/AssetStatsReporter.cs b/OpenSim/Framework/Statistics/AssetStatsReporter.cs
index 00422a8..66eb471 100644
--- a/OpenSim/Framework/Statistics/AssetStatsReporter.cs
+++ b/OpenSim/Framework/Statistics/AssetStatsReporter.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Text;
30using System.Timers; 29using System.Timers;
31 30
32namespace OpenSim.Framework.Statistics 31namespace OpenSim.Framework.Statistics
diff --git a/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs b/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs
index bef509d..0d85919 100644
--- a/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs
+++ b/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.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.Framework.Statistics.Interfaces 28namespace OpenSim.Framework.Statistics.Interfaces
31{ 29{
32 /// <summary> 30 /// <summary>
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
index 167b771..567d8dd 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
@@ -28,11 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31
32using OpenSim.Framework;
33using OpenSim.Framework.Statistics.Interfaces;
34
35using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework.Statistics.Interfaces;
36 33
37namespace OpenSim.Framework.Statistics 34namespace OpenSim.Framework.Statistics
38{ 35{
diff --git a/OpenSim/Framework/Statistics/UserStatsReporter.cs b/OpenSim/Framework/Statistics/UserStatsReporter.cs
index e7c9bce..ce82615 100644
--- a/OpenSim/Framework/Statistics/UserStatsReporter.cs
+++ b/OpenSim/Framework/Statistics/UserStatsReporter.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.Text;
29using System.Timers; 28using System.Timers;
30 29
31namespace OpenSim.Framework.Statistics 30namespace OpenSim.Framework.Statistics
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 36228b5..1cf2e58 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -25,13 +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.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
29using System.Xml; 31using System.Xml;
30using System.Xml.Schema; 32using System.Xml.Schema;
31using System.Xml.Serialization; 33using System.Xml.Serialization;
32
33using libsecondlife; 34using libsecondlife;
34using System; 35using log4net;
35 36
36namespace OpenSim.Framework 37namespace OpenSim.Framework
37{ 38{
@@ -43,7 +44,7 @@ namespace OpenSim.Framework
43 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>, 44 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>,
44 ICloneable, IXmlSerializable 45 ICloneable, IXmlSerializable
45 { 46 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 48
48 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof(TaskInventoryItem)); 49 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof(TaskInventoryItem));
49 50
diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs
index b71a0e1..8fe5b82 100644
--- a/OpenSim/Framework/ThreadTracker.cs
+++ b/OpenSim/Framework/ThreadTracker.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.Text;
32using System.Threading; 31using System.Threading;
33 32
34namespace OpenSim.Framework 33namespace OpenSim.Framework
@@ -36,7 +35,7 @@ namespace OpenSim.Framework
36 public static class ThreadTracker 35 public static class ThreadTracker
37 { 36 {
38 public static List<ThreadTrackerItem> m_Threads; 37 public static List<ThreadTrackerItem> m_Threads;
39 public static System.Threading.Thread ThreadTrackerThread; 38 public static Thread ThreadTrackerThread;
40 private static readonly long ThreadTimeout = 30 * 10000000; 39 private static readonly long ThreadTimeout = 30 * 10000000;
41 40
42 static ThreadTracker() 41 static ThreadTracker()
@@ -46,7 +45,7 @@ namespace OpenSim.Framework
46 ThreadTrackerThread = new Thread(ThreadTrackerThreadLoop); 45 ThreadTrackerThread = new Thread(ThreadTrackerThreadLoop);
47 ThreadTrackerThread.Name = "ThreadTrackerThread"; 46 ThreadTrackerThread.Name = "ThreadTrackerThread";
48 ThreadTrackerThread.IsBackground = true; 47 ThreadTrackerThread.IsBackground = true;
49 ThreadTrackerThread.Priority = System.Threading.ThreadPriority.BelowNormal; 48 ThreadTrackerThread.Priority = ThreadPriority.BelowNormal;
50 ThreadTrackerThread.Start(); 49 ThreadTrackerThread.Start();
51#endif 50#endif
52 } 51 }
@@ -60,7 +59,7 @@ namespace OpenSim.Framework
60 } 59 }
61 } 60 }
62 61
63 public static void Add(System.Threading.Thread thread) 62 public static void Add(Thread thread)
64 { 63 {
65#if DEBUG 64#if DEBUG
66 lock (m_Threads) 65 lock (m_Threads)
@@ -73,7 +72,7 @@ namespace OpenSim.Framework
73#endif 72#endif
74 } 73 }
75 74
76 public static void Remove(System.Threading.Thread thread) 75 public static void Remove(Thread thread)
77 { 76 {
78#if DEBUG 77#if DEBUG
79 lock (m_Threads) 78 lock (m_Threads)
@@ -126,7 +125,7 @@ namespace OpenSim.Framework
126 125
127 public class ThreadTrackerItem 126 public class ThreadTrackerItem
128 { 127 {
129 public System.Threading.Thread Thread; 128 public Thread Thread;
130 public long LastSeenActive; 129 public long LastSeenActive;
131 } 130 }
132 } 131 }
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 8335bba..8ae8f7e 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework.Console;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index ac1145f..2396519 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -26,24 +26,26 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Data; 29using System.Data;
31using System.IO; 30using System.IO;
32using System.Net; 31using System.Net;
33using System.Net.Sockets; 32using System.Net.Sockets;
33using System.Reflection;
34using System.Runtime.Serialization;
35using System.Runtime.Serialization.Formatters.Binary;
34using System.Security.Cryptography; 36using System.Security.Cryptography;
35using System.Text; 37using System.Text;
38using System.Text.RegularExpressions;
36using libsecondlife; 39using libsecondlife;
40using log4net;
37using Nini.Config; 41using Nini.Config;
38using Nwc.XmlRpc; 42using Nwc.XmlRpc;
39 43
40using System.Runtime.Serialization;
41using System.Runtime.Serialization.Formatters.Binary;
42namespace OpenSim.Framework 44namespace OpenSim.Framework
43{ 45{
44 public class Util 46 public class Util
45 { 47 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 49
48 private static Random randomClass = new Random(); 50 private static Random randomClass = new Random();
49 private static uint nextXferID = 5000; 51 private static uint nextXferID = 5000;
@@ -385,7 +387,7 @@ namespace OpenSim.Framework
385 /// <returns>safe path</returns> 387 /// <returns>safe path</returns>
386 public static string safePath(string path) 388 public static string safePath(string path)
387 { 389 {
388 return System.Text.RegularExpressions.Regex.Replace(path, @regexInvalidPathChars, string.Empty); 390 return Regex.Replace(path, @regexInvalidPathChars, string.Empty);
389 } 391 }
390 392
391 /// <summary> 393 /// <summary>
@@ -395,7 +397,7 @@ namespace OpenSim.Framework
395 /// <returns>safe filename</returns> 397 /// <returns>safe filename</returns>
396 public static string safeFileName(string filename) 398 public static string safeFileName(string filename)
397 { 399 {
398 return System.Text.RegularExpressions.Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ; 400 return Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ;
399 } 401 }
400 402
401 // 403 //
@@ -520,7 +522,7 @@ namespace OpenSim.Framework
520 sr.Close(); 522 sr.Close();
521 return issue; 523 return issue;
522 } 524 }
523 catch (System.Exception) 525 catch (Exception)
524 { 526 {
525 return ""; 527 return "";
526 } 528 }
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 3a38e85..5a013b9 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -29,6 +29,8 @@ using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
33using log4net.Config;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Framework.AssetLoader.Filesystem; 35using OpenSim.Framework.AssetLoader.Filesystem;
34using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
@@ -42,7 +44,7 @@ namespace OpenSim.Grid.AssetServer
42 /// </summary> 44 /// </summary>
43 public class OpenAsset_Main : BaseOpenSimServer, conscmd_callback 45 public class OpenAsset_Main : BaseOpenSimServer, conscmd_callback
44 { 46 {
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 48
47 public AssetConfig m_config; 49 public AssetConfig m_config;
48 50
@@ -56,7 +58,7 @@ namespace OpenSim.Grid.AssetServer
56 [STAThread] 58 [STAThread]
57 public static void Main(string[] args) 59 public static void Main(string[] args)
58 { 60 {
59 log4net.Config.XmlConfigurator.Configure(); 61 XmlConfigurator.Configure();
60 62
61 m_log.Info("Starting...\n"); 63 m_log.Info("Starting...\n");
62 64
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index ae56a68..ece826e 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -27,12 +27,13 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection;
30using System.Text; 31using System.Text;
31using System.Xml; 32using System.Xml;
32using System.Xml.Serialization; 33using System.Xml.Serialization;
33using libsecondlife; 34using libsecondlife;
35using log4net;
34using OpenSim.Framework; 36using OpenSim.Framework;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
37using OpenSim.Framework.Statistics; 38using OpenSim.Framework.Statistics;
38 39
@@ -40,7 +41,7 @@ namespace OpenSim.Grid.AssetServer
40{ 41{
41 public class GetAssetStreamHandler : BaseStreamHandler 42 public class GetAssetStreamHandler : BaseStreamHandler
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 private OpenAsset_Main m_assetManager; 46 private OpenAsset_Main m_assetManager;
46 private IAssetProvider m_assetProvider; 47 private IAssetProvider m_assetProvider;
@@ -115,7 +116,7 @@ namespace OpenSim.Grid.AssetServer
115 116
116 public class PostAssetStreamHandler : BaseStreamHandler 117 public class PostAssetStreamHandler : BaseStreamHandler
117 { 118 {
118 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 119 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
119 120
120 private OpenAsset_Main m_assetManager; 121 private OpenAsset_Main m_assetManager;
121 private IAssetProvider m_assetProvider; 122 private IAssetProvider m_assetProvider;
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index ba526c0..ee2f129 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -31,18 +31,18 @@ using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Xml;
33using libsecondlife; 33using libsecondlife;
34using log4net;
34using Nwc.XmlRpc; 35using Nwc.XmlRpc;
35using OpenSim.Framework;
36using OpenSim.Framework.Console;
37using OpenSim.Data; 36using OpenSim.Data;
38using OpenSim.Framework.Servers;
39using OpenSim.Data.MySQL; 37using OpenSim.Data.MySQL;
38using OpenSim.Framework;
39using OpenSim.Framework.Servers;
40 40
41namespace OpenSim.Grid.GridServer 41namespace OpenSim.Grid.GridServer
42{ 42{
43 public class GridManager 43 public class GridManager
44 { 44 {
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 private Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>(); 47 private Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
48 private Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>(); 48 private Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>();
@@ -630,7 +630,7 @@ namespace OpenSim.Grid.GridServer
630 //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData(); 630 //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData();
631 try 631 try
632 { 632 {
633 OpenSim.Data.MySQL.MySQLGridData mysqldata = (OpenSim.Data.MySQL.MySQLGridData)(kvp.Value); 633 MySQLGridData mysqldata = (MySQLGridData)(kvp.Value);
634 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim); 634 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim);
635 DataResponse insertResponse = mysqldata.DeleteProfile(uuid); 635 DataResponse insertResponse = mysqldata.DeleteProfile(uuid);
636 switch (insertResponse) 636 switch (insertResponse)
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 3be98d8..2feaac3 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -26,16 +26,13 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
29using System.IO; 30using System.IO;
30using System.Timers; 31using System.Timers;
31using System.Collections; 32using Mono.Addins;
32using System.Collections.Generic;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using Nwc.XmlRpc;
37using Mono.Addins;
38using Mono.Addins.Description;
39 36
40namespace OpenSim.Grid.GridServer 37namespace OpenSim.Grid.GridServer
41{ 38{
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index b95e422..6eb4e15 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using log4net.Config;
30using System.Text;
31using OpenSim.Framework.Console;
32 30
33namespace OpenSim.Grid.GridServer 31namespace OpenSim.Grid.GridServer
34{ 32{
@@ -37,7 +35,7 @@ namespace OpenSim.Grid.GridServer
37 [STAThread] 35 [STAThread]
38 public static void Main(string[] args) 36 public static void Main(string[] args)
39 { 37 {
40 log4net.Config.XmlConfigurator.Configure(); 38 XmlConfigurator.Configure();
41 39
42 GridServerBase app = new GridServerBase(); 40 GridServerBase app = new GridServerBase();
43 41
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index f7c9828..82ba7df 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -27,13 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Threading; 30using System.Reflection;
31
32using libsecondlife; 31using libsecondlife;
33 32using log4net;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
36using OpenSim.Framework.Console;
37 35
38namespace OpenSim.Grid.InventoryServer 36namespace OpenSim.Grid.InventoryServer
39{ 37{
@@ -42,8 +40,8 @@ namespace OpenSim.Grid.InventoryServer
42 /// </summary> 40 /// </summary>
43 public class GridInventoryService : InventoryServiceBase 41 public class GridInventoryService : InventoryServiceBase
44 { 42 {
45 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
46 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 45
48 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) 46 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback)
49 { 47 {
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index ed154a8..b3c6891 100644
--- a/OpenSim/Grid/InventoryServer/InventoryManager.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
@@ -32,15 +32,15 @@ using System.Text;
32using System.Xml; 32using System.Xml;
33using System.Xml.Serialization; 33using System.Xml.Serialization;
34using libsecondlife; 34using libsecondlife;
35using log4net;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38 38
39namespace OpenSim.Grid.InventoryServer 39namespace OpenSim.Grid.InventoryServer
40{ 40{
41 public class InventoryManager 41 public class InventoryManager
42 { 42 {
43 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);
44 44
45 private IInventoryData _databasePlugin; 45 private IInventoryData _databasePlugin;
46 46
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 3987334..2454650 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -28,7 +28,10 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
33using log4net;
34using log4net.Config;
32using OpenSim.Framework; 35using OpenSim.Framework;
33using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
34using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
@@ -37,7 +40,7 @@ namespace OpenSim.Grid.InventoryServer
37{ 40{
38 public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback 41 public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback
39 { 42 {
40 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);
41 44
42 private InventoryManager m_inventoryManager; 45 private InventoryManager m_inventoryManager;
43 private InventoryConfig m_config; 46 private InventoryConfig m_config;
@@ -48,7 +51,7 @@ namespace OpenSim.Grid.InventoryServer
48 [STAThread] 51 [STAThread]
49 public static void Main(string[] args) 52 public static void Main(string[] args)
50 { 53 {
51 log4net.Config.XmlConfigurator.Configure(); 54 XmlConfigurator.Configure();
52 55
53 OpenInventory_Main theServer = new OpenInventory_Main(); 56 OpenInventory_Main theServer = new OpenInventory_Main();
54 theServer.Startup(); 57 theServer.Startup();
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index b288b33..bf793bf 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -26,11 +26,12 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.IO; 29using System.IO;
30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
33using log4net.Config;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
35using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
36 37
@@ -40,7 +41,7 @@ namespace OpenSim.Grid.MessagingServer
40 /// </summary> 41 /// </summary>
41 public class OpenMessage_Main : BaseOpenSimServer, conscmd_callback 42 public class OpenMessage_Main : BaseOpenSimServer, conscmd_callback
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 private MessageServerConfig Cfg; 46 private MessageServerConfig Cfg;
46 private MessageService msgsvc; 47 private MessageService msgsvc;
@@ -50,7 +51,7 @@ namespace OpenSim.Grid.MessagingServer
50 [STAThread] 51 [STAThread]
51 public static void Main(string[] args) 52 public static void Main(string[] args)
52 { 53 {
53 log4net.Config.XmlConfigurator.Configure(); 54 XmlConfigurator.Configure();
54 55
55 m_log.Info("Launching MessagingServer..."); 56 m_log.Info("Launching MessagingServer...");
56 57
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index 1b16cb2..d824d21 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -26,25 +26,23 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Net;
30using System.Net.Sockets;
31using System.Collections; 29using System.Collections;
32using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net;
32using System.Reflection;
33using System.Threading; 33using System.Threading;
34//using System.Xml;
35using libsecondlife; 34using libsecondlife;
35using log4net;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Framework;
38using OpenSim.Framework.Console;
39using OpenSim.Data; 37using OpenSim.Data;
40using OpenSim.Framework.Servers; 38using OpenSim.Framework;
41using FriendRights = libsecondlife.FriendRights; 39//using System.Xml;
42 40
43namespace OpenSim.Grid.MessagingServer 41namespace OpenSim.Grid.MessagingServer
44{ 42{
45 public class MessageService 43 public class MessageService
46 { 44 {
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 46
49 private MessageServerConfig m_cfg; 47 private MessageServerConfig m_cfg;
50 48
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index f270bbe..59d0e13 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -25,18 +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;
29using System.Collections; 28using System.Collections;
30using System.Collections.Generic; 29using System.Reflection;
31using System.Net; 30using log4net;
32using System.Net.Sockets;
33using System.Text;
34using libsecondlife;
35using Nwc.XmlRpc; 31using Nwc.XmlRpc;
36using OpenSim.Framework;
37using OpenSim.Framework.Console;
38using OpenSim.Data; 32using OpenSim.Data;
39using OpenSim.Framework.Servers;
40 33
41namespace OpenSim.Grid.MessagingServer 34namespace OpenSim.Grid.MessagingServer
42{ 35{
@@ -44,7 +37,7 @@ namespace OpenSim.Grid.MessagingServer
44 { 37 {
45 public UserPresenceData presence1 = null; 38 public UserPresenceData presence1 = null;
46 public UserPresenceData presence2 = null; 39 public UserPresenceData presence2 = null;
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 41
49 public PresenceInformer() 42 public PresenceInformer()
50 { 43 {
diff --git a/OpenSim/Grid/MessagingServer/UserPresenceData.cs b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
index 4390903..7188201 100644
--- a/OpenSim/Grid/MessagingServer/UserPresenceData.cs
+++ b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
@@ -26,11 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using libsecondlife; 30using libsecondlife;
32using OpenSim.Framework;
33using OpenSim.Data; 31using OpenSim.Data;
32using OpenSim.Framework;
34 33
35namespace OpenSim.Grid.MessagingServer 34namespace OpenSim.Grid.MessagingServer
36{ 35{
diff --git a/OpenSim/Grid/MessagingServer/WorkUnitBase.cs b/OpenSim/Grid/MessagingServer/WorkUnitBase.cs
index c4e6240..d25f044 100644
--- a/OpenSim/Grid/MessagingServer/WorkUnitBase.cs
+++ b/OpenSim/Grid/MessagingServer/WorkUnitBase.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 public class WorkUnitBase 30 public class WorkUnitBase
diff --git a/OpenSim/Grid/MessagingServer/WorkUnitPresenceUpdate.cs b/OpenSim/Grid/MessagingServer/WorkUnitPresenceUpdate.cs
index c54b4d9..c31f0c7 100644
--- a/OpenSim/Grid/MessagingServer/WorkUnitPresenceUpdate.cs
+++ b/OpenSim/Grid/MessagingServer/WorkUnitPresenceUpdate.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 public class WorkUnitPresenceUpdate : WorkUnitBase 30 public class WorkUnitPresenceUpdate : WorkUnitBase
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index 4a66717..df3bc22 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -27,19 +27,16 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Text; 30using System.Reflection;
31using System.Xml;
32using System.Xml.Serialization;
33using libsecondlife; 31using libsecondlife;
34using OpenSim.Framework; 32using log4net;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
37 34
38namespace OpenSim.Grid.MessagingServer 35namespace OpenSim.Grid.MessagingServer
39{ 36{
40 public class XMPPHTTPStreamHandler : BaseStreamHandler 37 public class XMPPHTTPStreamHandler : BaseStreamHandler
41 { 38 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 40
44 41
45 /// <summary> 42 /// <summary>
@@ -85,7 +82,7 @@ namespace OpenSim.Grid.MessagingServer
85 82
86 public class PostXMPPStreamHandler : BaseStreamHandler 83 public class PostXMPPStreamHandler : BaseStreamHandler
87 { 84 {
88 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 85 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
89 86
90 public override byte[] Handle(string path, Stream request) 87 public override byte[] Handle(string path, Stream request)
91 { 88 {
diff --git a/OpenSim/Grid/ScriptServer/Application.cs b/OpenSim/Grid/ScriptServer/Application.cs
index 5cf781f..ef93f65 100644
--- a/OpenSim/Grid/ScriptServer/Application.cs
+++ b/OpenSim/Grid/ScriptServer/Application.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using log4net.Config;
29 30
30namespace OpenSim.Grid.ScriptServer 31namespace OpenSim.Grid.ScriptServer
31{ 32{
@@ -35,7 +36,7 @@ namespace OpenSim.Grid.ScriptServer
35 36
36 private static void Main(string[] args) 37 private static void Main(string[] args)
37 { 38 {
38 log4net.Config.XmlConfigurator.Configure(); 39 XmlConfigurator.Configure();
39 40
40 AppDomain.CurrentDomain.UnhandledException += 41 AppDomain.CurrentDomain.UnhandledException +=
41 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); 42 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
diff --git a/OpenSim/Grid/ScriptServer/FakeScene.cs b/OpenSim/Grid/ScriptServer/FakeScene.cs
index bb2ff4e..480050d 100644
--- a/OpenSim/Grid/ScriptServer/FakeScene.cs
+++ b/OpenSim/Grid/ScriptServer/FakeScene.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 OpenSim.Framework; 28using OpenSim.Framework;
32using OpenSim.Framework.Communications; 29using OpenSim.Framework.Communications;
33using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Grid/ScriptServer/RemotingObject.cs b/OpenSim/Grid/ScriptServer/RemotingObject.cs
index 8cdebe7..9d3065b 100644
--- a/OpenSim/Grid/ScriptServer/RemotingObject.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingObject.cs
@@ -26,9 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Region.Environment.Interfaces;
32using OpenSim.Region.ScriptEngine.Common; 29using OpenSim.Region.ScriptEngine.Common;
33 30
34namespace OpenSim.Grid.ScriptServer 31namespace OpenSim.Grid.ScriptServer
diff --git a/OpenSim/Grid/ScriptServer/RemotingServer.cs b/OpenSim/Grid/ScriptServer/RemotingServer.cs
index 6d8cc19..7d0e334 100644
--- a/OpenSim/Grid/ScriptServer/RemotingServer.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingServer.cs
@@ -25,13 +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;
30using System.Text;
31using System.Runtime.Remoting; 28using System.Runtime.Remoting;
32using System.Runtime.Remoting.Channels; 29using System.Runtime.Remoting.Channels;
33using System.Runtime.Remoting.Channels.Tcp; 30using System.Runtime.Remoting.Channels.Tcp;
34using OpenSim.Region.ScriptEngine.Common;
35 31
36namespace OpenSim.Grid.ScriptServer 32namespace OpenSim.Grid.ScriptServer
37{ 33{
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
index a3d014d..a9679f8 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.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 OpenSim.Framework.Console;
29
30namespace OpenSim.Grid.ScriptServer 28namespace OpenSim.Grid.ScriptServer
31{ 29{
32 // Maintains connection and communication to a region 30 // Maintains connection and communication to a region
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
index 6cfd6bf..c87352c 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
@@ -27,7 +27,7 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Threading; 29using System.Threading;
30using OpenSim.Framework.Console; 30using OpenSim.Framework;
31 31
32namespace OpenSim.Grid.ScriptServer 32namespace OpenSim.Grid.ScriptServer
33{ 33{
@@ -61,7 +61,7 @@ namespace OpenSim.Grid.ScriptServer
61 listenThread.Name = "ListenThread"; 61 listenThread.Name = "ListenThread";
62 listenThread.IsBackground = true; 62 listenThread.IsBackground = true;
63 listenThread.Start(); 63 listenThread.Start();
64 OpenSim.Framework.ThreadTracker.Add(listenThread); 64 ThreadTracker.Add(listenThread);
65 } 65 }
66 66
67 /// <summary> 67 /// <summary>
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
index 6fcf5c8..4d8c559 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
@@ -28,14 +28,14 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using OpenSim.Framework.Console; 31using log4net;
32using OpenSim.Region.ScriptEngine.Common; 32using OpenSim.Region.ScriptEngine.Common;
33 33
34namespace OpenSim.Grid.ScriptServer.ScriptServer 34namespace OpenSim.Grid.ScriptServer.ScriptServer
35{ 35{
36 internal class ScriptEngineLoader 36 internal class ScriptEngineLoader
37 { 37 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 39
40 public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName) 40 public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName)
41 { 41 {
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
index 2cb46dd..9d67602 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenSim.Framework.Console;
30using OpenSim.Region.ScriptEngine.Common; 29using OpenSim.Region.ScriptEngine.Common;
31 30
32namespace OpenSim.Grid.ScriptServer.ScriptServer 31namespace OpenSim.Grid.ScriptServer.ScriptServer
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 12e5f1d..729d262 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.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;
29using System.Reflection;
29using libsecondlife; 30using libsecondlife;
30using Nini.Config; 31using log4net;
31using OpenSim.Framework;
32using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
33using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
34using OpenSim.Grid.ScriptServer.ScriptServer; 34using OpenSim.Grid.ScriptServer.ScriptServer;
@@ -39,7 +39,7 @@ namespace OpenSim.Grid.ScriptServer
39{ 39{
40 public class ScriptServerMain : BaseOpenSimServer, conscmd_callback 40 public class ScriptServerMain : BaseOpenSimServer, conscmd_callback
41 { 41 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 // 44 //
45 // Root object. Creates objects used. 45 // Root object. Creates objects used.
@@ -77,7 +77,7 @@ namespace OpenSim.Grid.ScriptServer
77 RPC.ReceiveCommand += new TRPC_Remote.ReceiveCommandDelegate(RPC_ReceiveCommand); 77 RPC.ReceiveCommand += new TRPC_Remote.ReceiveCommandDelegate(RPC_ReceiveCommand);
78 m_TCPServer.StartListen(); 78 m_TCPServer.StartListen();
79 79
80 System.Console.ReadLine(); 80 Console.ReadLine();
81 } 81 }
82 82
83 private void RPC_ReceiveCommand(int ID, string Command, object[] p) 83 private void RPC_ReceiveCommand(int ID, string Command, object[] p)
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 0f0104e..0534e3b 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -28,7 +28,11 @@
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 libsecondlife; 33using libsecondlife;
34using log4net;
35using log4net.Config;
32using OpenSim.Framework; 36using OpenSim.Framework;
33using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
@@ -41,7 +45,7 @@ namespace OpenSim.Grid.UserServer
41 /// </summary> 45 /// </summary>
42 public class OpenUser_Main : BaseOpenSimServer, conscmd_callback 46 public class OpenUser_Main : BaseOpenSimServer, conscmd_callback
43 { 47 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 49
46 private UserConfig Cfg; 50 private UserConfig Cfg;
47 51
@@ -54,7 +58,7 @@ namespace OpenSim.Grid.UserServer
54 [STAThread] 58 [STAThread]
55 public static void Main(string[] args) 59 public static void Main(string[] args)
56 { 60 {
57 log4net.Config.XmlConfigurator.Configure(); 61 XmlConfigurator.Configure();
58 62
59 m_log.Info("Launching UserServer..."); 63 m_log.Info("Launching UserServer...");
60 64
@@ -191,7 +195,7 @@ namespace OpenSim.Grid.UserServer
191 } 195 }
192 196
193 } 197 }
194 catch (System.Net.WebException e) 198 catch (WebException e)
195 { 199 {
196 m_log.ErrorFormat( 200 m_log.ErrorFormat(
197 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", 201 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}",
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 6355c4d..22505cb 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.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 System;
29using System.Collections; 28using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Text; 30using System.Net;
32using System.Threading; 31using System.Reflection;
33using libsecondlife; 32using libsecondlife;
33using log4net;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
39 36
40namespace OpenSim.Grid.UserServer 37namespace OpenSim.Grid.UserServer
41{ 38{
42 public class MessageServersConnector 39 public class MessageServersConnector
43 { 40 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 42
46 public Dictionary<string, MessageServerInfo> MessageServers; 43 public Dictionary<string, MessageServerInfo> MessageServers;
47 44
@@ -214,7 +211,7 @@ namespace OpenSim.Grid.UserServer
214 { 211 {
215 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); 212 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000);
216 } 213 }
217 catch (System.Net.WebException) 214 catch (WebException)
218 { 215 {
219 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about log out. Other users might still think this user is online"); 216 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about log out. Other users might still think this user is online");
220 } 217 }
@@ -249,7 +246,7 @@ namespace OpenSim.Grid.UserServer
249 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); 246 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000);
250 m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login"); 247 m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login");
251 } 248 }
252 catch (System.Net.WebException) 249 catch (WebException)
253 { 250 {
254 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login. Presence might be borked for this user"); 251 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login. Presence might be borked for this user");
255 } 252 }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index d7a3b1a..f294dcf 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -28,18 +28,15 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Threading; 31using System.Reflection;
32using libsecondlife; 32using libsecondlife;
33using log4net;
33using Nwc.XmlRpc; 34using Nwc.XmlRpc;
34 35using OpenSim.Data;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Console;
38using OpenSim.Data;
39using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
40using OpenSim.Framework.Statistics;
41using OpenSim.Framework.UserManagement; 39using OpenSim.Framework.UserManagement;
42using InventoryFolder=OpenSim.Framework.InventoryFolder;
43 40
44namespace OpenSim.Grid.UserServer 41namespace OpenSim.Grid.UserServer
45{ 42{
@@ -48,7 +45,7 @@ namespace OpenSim.Grid.UserServer
48 45
49 public class UserLoginService : LoginService 46 public class UserLoginService : LoginService
50 { 47 {
51 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 49
53 public event UserLoggedInAtLocation OnUserLoggedInAtLocation; 50 public event UserLoggedInAtLocation OnUserLoggedInAtLocation;
54 51
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 2a53d7b..aa2c959 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -28,11 +28,12 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
31using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using Nwc.XmlRpc; 35using Nwc.XmlRpc;
34using OpenSim.Framework; 36using OpenSim.Framework;
35using OpenSim.Framework.Statistics;
36using OpenSim.Framework.UserManagement; 37using OpenSim.Framework.UserManagement;
37 38
38namespace OpenSim.Grid.UserServer 39namespace OpenSim.Grid.UserServer
@@ -41,7 +42,7 @@ namespace OpenSim.Grid.UserServer
41 42
42 public class UserManager : UserManagerBase 43 public class UserManager : UserManagerBase
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 public event logOffUser OnLogOffUser; 47 public event logOffUser OnLogOffUser;
47 private logOffUser handlerLogOffUser = null; 48 private logOffUser handlerLogOffUser = null;
@@ -389,7 +390,7 @@ namespace OpenSim.Grid.UserServer
389 { 390 {
390 userProfile.HomeLocationX = (float)Convert.ToDecimal((string)requestData["home_pos_x"]); 391 userProfile.HomeLocationX = (float)Convert.ToDecimal((string)requestData["home_pos_x"]);
391 } 392 }
392 catch (System.InvalidCastException) 393 catch (InvalidCastException)
393 { 394 {
394 m_log.Error("[PROFILE]:Failed to set home postion x"); 395 m_log.Error("[PROFILE]:Failed to set home postion x");
395 } 396 }
@@ -401,7 +402,7 @@ namespace OpenSim.Grid.UserServer
401 { 402 {
402 userProfile.HomeLocationY = (float)Convert.ToDecimal((string)requestData["home_pos_y"]); 403 userProfile.HomeLocationY = (float)Convert.ToDecimal((string)requestData["home_pos_y"]);
403 } 404 }
404 catch (System.InvalidCastException) 405 catch (InvalidCastException)
405 { 406 {
406 m_log.Error("[PROFILE]:Failed to set home postion y"); 407 m_log.Error("[PROFILE]:Failed to set home postion y");
407 } 408 }
@@ -412,7 +413,7 @@ namespace OpenSim.Grid.UserServer
412 { 413 {
413 userProfile.HomeLocationZ = (float)Convert.ToDecimal((string)requestData["home_pos_z"]); 414 userProfile.HomeLocationZ = (float)Convert.ToDecimal((string)requestData["home_pos_z"]);
414 } 415 }
415 catch (System.InvalidCastException) 416 catch (InvalidCastException)
416 { 417 {
417 m_log.Error("[PROFILE]:Failed to set home postion z"); 418 m_log.Error("[PROFILE]:Failed to set home postion z");
418 } 419 }
@@ -423,7 +424,7 @@ namespace OpenSim.Grid.UserServer
423 { 424 {
424 userProfile.HomeLookAtX = (float)Convert.ToDecimal((string)requestData["home_look_x"]); 425 userProfile.HomeLookAtX = (float)Convert.ToDecimal((string)requestData["home_look_x"]);
425 } 426 }
426 catch (System.InvalidCastException) 427 catch (InvalidCastException)
427 { 428 {
428 m_log.Error("[PROFILE]:Failed to set home lookat x"); 429 m_log.Error("[PROFILE]:Failed to set home lookat x");
429 } 430 }
@@ -434,7 +435,7 @@ namespace OpenSim.Grid.UserServer
434 { 435 {
435 userProfile.HomeLookAtY = (float)Convert.ToDecimal((string)requestData["home_look_y"]); 436 userProfile.HomeLookAtY = (float)Convert.ToDecimal((string)requestData["home_look_y"]);
436 } 437 }
437 catch (System.InvalidCastException) 438 catch (InvalidCastException)
438 { 439 {
439 m_log.Error("[PROFILE]:Failed to set home lookat y"); 440 m_log.Error("[PROFILE]:Failed to set home lookat y");
440 } 441 }
@@ -445,7 +446,7 @@ namespace OpenSim.Grid.UserServer
445 { 446 {
446 userProfile.HomeLookAtZ = (float)Convert.ToDecimal((string)requestData["home_look_z"]); 447 userProfile.HomeLookAtZ = (float)Convert.ToDecimal((string)requestData["home_look_z"]);
447 } 448 }
448 catch (System.InvalidCastException) 449 catch (InvalidCastException)
449 { 450 {
450 m_log.Error("[PROFILE]:Failed to set home lookat z"); 451 m_log.Error("[PROFILE]:Failed to set home lookat z");
451 } 452 }
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index ae299a4..eaa4788 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Net; 29using log4net.Config;
30using Nini.Config; 30using Nini.Config;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
@@ -44,7 +44,7 @@ namespace OpenSim
44 // First line 44 // First line
45 AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); 45 AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
46 46
47 log4net.Config.XmlConfigurator.Configure(); 47 XmlConfigurator.Configure();
48 48
49 Console.WriteLine("OpenSim " + VersionInfo.Version + "\n"); 49 Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
50 50
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 14cbe13..aa08f81 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -29,10 +29,13 @@ 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.Text; 34using System.Text;
33using System.Threading; 35using System.Threading;
34using System.Timers; 36using System.Timers;
35using libsecondlife; 37using libsecondlife;
38using log4net;
36using Mono.Addins; 39using Mono.Addins;
37using Nini.Config; 40using Nini.Config;
38using OpenSim.Framework; 41using OpenSim.Framework;
@@ -47,7 +50,7 @@ using OpenSim.Region.Environment;
47using OpenSim.Region.Environment.Interfaces; 50using OpenSim.Region.Environment.Interfaces;
48using OpenSim.Region.Environment.Scenes; 51using OpenSim.Region.Environment.Scenes;
49using OpenSim.Region.Physics.Manager; 52using OpenSim.Region.Physics.Manager;
50using Timer = System.Timers.Timer; 53using Timer=System.Timers.Timer;
51 54
52namespace OpenSim 55namespace OpenSim
53{ 56{
@@ -55,7 +58,7 @@ namespace OpenSim
55 58
56 public class OpenSimMain : RegionApplicationBase, conscmd_callback 59 public class OpenSimMain : RegionApplicationBase, conscmd_callback
57 { 60 {
58 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 61 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
59 private string proxyUrl; 62 private string proxyUrl;
60 private int proxyOffset = 0; 63 private int proxyOffset = 0;
61 64
@@ -757,7 +760,7 @@ namespace OpenSim
757 } 760 }
758 else 761 else
759 { 762 {
760 m_sceneManager.CurrentScene.SetSceneCoreDebug(!System.Convert.ToBoolean(cmdparams[0]), !System.Convert.ToBoolean(cmdparams[1]), !System.Convert.ToBoolean(cmdparams[2])); 763 m_sceneManager.CurrentScene.SetSceneCoreDebug(!Convert.ToBoolean(cmdparams[0]), !Convert.ToBoolean(cmdparams[1]), !Convert.ToBoolean(cmdparams[2]));
761 } 764 }
762 } 765 }
763 else 766 else
@@ -813,7 +816,7 @@ namespace OpenSim
813// m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString()); 816// m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString());
814// } 817// }
815 818
816 List<Thread> threads = OpenSim.Framework.ThreadTracker.GetThreads(); 819 List<Thread> threads = ThreadTracker.GetThreads();
817 if (threads == null) 820 if (threads == null)
818 { 821 {
819 m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode."); 822 m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode.");
@@ -1056,7 +1059,7 @@ namespace OpenSim
1056 case "unload": 1059 case "unload":
1057 if (cmdparams.Length > 1) 1060 if (cmdparams.Length > 1)
1058 { 1061 {
1059 foreach (IRegionModule rm in new System.Collections.ArrayList(m_moduleLoader.GetLoadedSharedModules)) 1062 foreach (IRegionModule rm in new ArrayList(m_moduleLoader.GetLoadedSharedModules))
1060 { 1063 {
1061 if (rm.Name.ToLower() == cmdparams[1].ToLower()) 1064 if (rm.Name.ToLower() == cmdparams[1].ToLower())
1062 { 1065 {
@@ -1069,7 +1072,7 @@ namespace OpenSim
1069 case "load": 1072 case "load":
1070 if (cmdparams.Length > 1) 1073 if (cmdparams.Length > 1)
1071 { 1074 {
1072 foreach (Scene s in new System.Collections.ArrayList(m_sceneManager.Scenes)) 1075 foreach (Scene s in new ArrayList(m_sceneManager.Scenes))
1073 { 1076 {
1074 1077
1075 m_console.Notice("Loading module: " + cmdparams[1]); 1078 m_console.Notice("Loading module: " + cmdparams[1]);
@@ -1142,7 +1145,7 @@ namespace OpenSim
1142 { 1145 {
1143 RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); 1146 RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
1144 string regionName; 1147 string regionName;
1145 System.Net.EndPoint ep = null; 1148 EndPoint ep = null;
1146 1149
1147 if (regionInfo == null) 1150 if (regionInfo == null)
1148 { 1151 {
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 292f7f6..7ff1f23 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -29,17 +29,18 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Net.Sockets; 31using System.Net.Sockets;
32using System.Reflection;
32using System.Text; 33using System.Text;
33using System.Threading; 34using System.Threading;
34using System.Timers; 35using System.Timers;
35using Axiom.Math; 36using Axiom.Math;
36using libsecondlife; 37using libsecondlife;
37using libsecondlife.Packets; 38using libsecondlife.Packets;
39using log4net;
38using OpenSim.Framework; 40using OpenSim.Framework;
39using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Console;
41using OpenSim.Region.Environment.Scenes; 42using OpenSim.Region.Environment.Scenes;
42using Timer = System.Timers.Timer; 43using Timer=System.Timers.Timer;
43 44
44namespace OpenSim.Region.ClientStack 45namespace OpenSim.Region.ClientStack
45{ 46{
@@ -51,7 +52,7 @@ namespace OpenSim.Region.ClientStack
51 /// </summary> 52 /// </summary>
52 public class ClientView : IClientAPI 53 public class ClientView : IClientAPI
53 { 54 {
54 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 55 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
55 56
56 // ~ClientView() 57 // ~ClientView()
57 // { 58 // {
@@ -341,7 +342,7 @@ namespace OpenSim.Region.ClientStack
341 m_clientThread.Name = "ClientThread"; 342 m_clientThread.Name = "ClientThread";
342 m_clientThread.IsBackground = true; 343 m_clientThread.IsBackground = true;
343 m_clientThread.Start(); 344 m_clientThread.Start();
344 OpenSim.Framework.ThreadTracker.Add(m_clientThread); 345 ThreadTracker.Add(m_clientThread);
345 } 346 }
346 347
347 public void SetDebug(int newDebug) 348 public void SetDebug(int newDebug)
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 485c013..f9e3dc8 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.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.Net; 28using System.Net;
30using System.Net.Sockets; 29using System.Net.Sockets;
31using libsecondlife; 30using libsecondlife;
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 2b023a6..bc0bea3 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -25,10 +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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Net; 29using System.Net;
30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32using OpenSim.Framework; 33using OpenSim.Framework;
33using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
@@ -42,8 +43,8 @@ namespace OpenSim.Region.ClientStack
42{ 43{
43 public abstract class RegionApplicationBase : BaseOpenSimServer 44 public abstract class RegionApplicationBase : BaseOpenSimServer
44 { 45 {
45 private static readonly log4net.ILog m_log 46 private static readonly ILog m_log
46 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 48
48 protected AssetCache m_assetCache; 49 protected AssetCache m_assetCache;
49 protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>(); 50 protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>();
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 7a4cc97..7c4c03c 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -26,20 +26,20 @@
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.Net.Sockets; 31using System.Net.Sockets;
32using System.Reflection;
33using libsecondlife.Packets; 33using libsecondlife.Packets;
34using log4net;
34using OpenSim.Framework; 35using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Console;
37 37
38namespace OpenSim.Region.ClientStack 38namespace OpenSim.Region.ClientStack
39{ 39{
40 public class UDPServer : ClientStackNetworkHandler 40 public class UDPServer : ClientStackNetworkHandler
41 { 41 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); 44 protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
45 public Dictionary<uint, EndPoint> clientCircuits_reverse = new Dictionary<uint, EndPoint>(); 45 public Dictionary<uint, EndPoint> clientCircuits_reverse = new Dictionary<uint, EndPoint>();
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index f5a5e83..2960a62 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -25,18 +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.Collections; 29using System.Collections;
29using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
30using libsecondlife; 32using libsecondlife;
33using log4net;
31using OpenSim.Framework; 34using OpenSim.Framework;
32using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
33using OpenSim.Framework.Console;
34 36
35namespace OpenSim.Region.Communications.Local 37namespace OpenSim.Region.Communications.Local
36{ 38{
37 public class LocalBackEndServices : IGridServices, IInterRegionCommunications 39 public class LocalBackEndServices : IGridServices, IInterRegionCommunications
38 { 40 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 42
41 protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>(); 43 protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>();
42 44
@@ -47,7 +49,7 @@ namespace OpenSim.Region.Communications.Local
47 49
48 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>(); 50 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
49 51
50 public string _gdebugRegionName = System.String.Empty; 52 public string _gdebugRegionName = String.Empty;
51 53
52 bool m_bAvailable=true; 54 bool m_bAvailable=true;
53 55
@@ -67,7 +69,7 @@ namespace OpenSim.Region.Communications.Local
67 set { _gdebugRegionName = value; } 69 set { _gdebugRegionName = value; }
68 } 70 }
69 71
70 public string _rdebugRegionName = System.String.Empty; 72 public string _rdebugRegionName = String.Empty;
71 73
72 public string rdebugRegionName 74 public string rdebugRegionName
73 { 75 {
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index dafd637..a567eeb 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -26,7 +26,9 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
29using libsecondlife; 30using libsecondlife;
31using log4net;
30using OpenSim.Framework; 32using OpenSim.Framework;
31using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
32using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
@@ -39,8 +41,8 @@ namespace OpenSim.Region.Communications.Local
39 /// </summary> 41 /// </summary>
40 public class LocalInventoryService : InventoryServiceBase 42 public class LocalInventoryService : InventoryServiceBase
41 { 43 {
42 private static readonly log4net.ILog m_log 44 private static readonly ILog m_log
43 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 46
45 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) 47 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback)
46 { 48 {
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 79bf9e5..c4823f4 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.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;
31using libsecondlife; 32using libsecondlife;
32 33using log4net;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Statistics;
37using OpenSim.Framework.UserManagement; 35using OpenSim.Framework.UserManagement;
38using InventoryFolder=OpenSim.Framework.InventoryFolder;
39 36
40namespace OpenSim.Region.Communications.Local 37namespace OpenSim.Region.Communications.Local
41{ 38{
@@ -43,8 +40,8 @@ namespace OpenSim.Region.Communications.Local
43 40
44 public class LocalLoginService : LoginService 41 public class LocalLoginService : LoginService
45 { 42 {
46 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
47 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 45
49 private CommunicationsLocal m_Parent; 46 private CommunicationsLocal m_Parent;
50 47
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index c543762..29de8fd 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -29,7 +29,6 @@ using System;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.Statistics;
33using OpenSim.Framework.UserManagement; 32using OpenSim.Framework.UserManagement;
34 33
35namespace OpenSim.Region.Communications.Local 34namespace OpenSim.Region.Communications.Local
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 1135ddd..eada868 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -30,15 +30,17 @@ using 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.Runtime.Remoting; 34using System.Runtime.Remoting;
34using System.Runtime.Remoting.Channels; 35using System.Runtime.Remoting.Channels;
35using System.Runtime.Remoting.Channels.Tcp; 36using System.Runtime.Remoting.Channels.Tcp;
36using System.Security.Authentication; 37using System.Security.Authentication;
38using System.Threading;
37using libsecondlife; 39using libsecondlife;
40using log4net;
38using Nwc.XmlRpc; 41using Nwc.XmlRpc;
39using OpenSim.Framework; 42using OpenSim.Framework;
40using OpenSim.Framework.Communications; 43using OpenSim.Framework.Communications;
41using OpenSim.Framework.Console;
42using OpenSim.Framework.Servers; 44using OpenSim.Framework.Servers;
43using OpenSim.Region.Communications.Local; 45using OpenSim.Region.Communications.Local;
44 46
@@ -46,7 +48,7 @@ namespace OpenSim.Region.Communications.OGS1
46{ 48{
47 public class OGS1GridServices : IGridServices, IInterRegionCommunications 49 public class OGS1GridServices : IGridServices, IInterRegionCommunications
48 { 50 {
49 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 52
51 private LocalBackEndServices m_localBackend = new LocalBackEndServices(); 53 private LocalBackEndServices m_localBackend = new LocalBackEndServices();
52 private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>(); 54 private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
@@ -1461,7 +1463,7 @@ namespace OpenSim.Region.Communications.OGS1
1461 Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); 1463 Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
1462 IAsyncResult ar = socket.BeginConnect(m_EndPoint, ConnectedMethodCallback, socket); 1464 IAsyncResult ar = socket.BeginConnect(m_EndPoint, ConnectedMethodCallback, socket);
1463 ar.AsyncWaitHandle.WaitOne(timeOut*1000, false); 1465 ar.AsyncWaitHandle.WaitOne(timeOut*1000, false);
1464 System.Threading.Thread.Sleep(500); 1466 Thread.Sleep(500);
1465 } 1467 }
1466 1468
1467 public bool Available 1469 public bool Available
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 2e106d7..8285fb1 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -26,8 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Reflection;
29using System.Runtime.Remoting; 30using System.Runtime.Remoting;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using OpenSim.Framework; 33using OpenSim.Framework;
32 34
33namespace OpenSim.Region.Communications.OGS1 35namespace OpenSim.Region.Communications.OGS1
@@ -153,7 +155,7 @@ namespace OpenSim.Region.Communications.OGS1
153 155
154 public class OGS1InterRegionRemoting : MarshalByRefObject 156 public class OGS1InterRegionRemoting : MarshalByRefObject
155 { 157 {
156 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 158 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
157 159
158 public OGS1InterRegionRemoting() 160 public OGS1InterRegionRemoting()
159 { 161 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index fbe905c..e0167a7 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -27,19 +27,21 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net;
31using System.Reflection;
30using libsecondlife; 32using libsecondlife;
33using log4net;
31using OpenSim.Framework; 34using OpenSim.Framework;
32using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
33using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Console;
35using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
36 38
37namespace OpenSim.Region.Communications.OGS1 39namespace OpenSim.Region.Communications.OGS1
38{ 40{
39 public class OGS1InventoryService : IInventoryServices 41 public class OGS1InventoryService : IInventoryServices
40 { 42 {
41 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
42 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 45
44 private string _inventoryServerUrl; 46 private string _inventoryServerUrl;
45 private Dictionary<LLUUID, InventoryRequest> m_RequestingInventory = new Dictionary<LLUUID, InventoryRequest>(); 47 private Dictionary<LLUUID, InventoryRequest> m_RequestingInventory = new Dictionary<LLUUID, InventoryRequest>();
@@ -71,7 +73,7 @@ namespace OpenSim.Region.Communications.OGS1
71 73
72 requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID); 74 requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID);
73 } 75 }
74 catch (System.Net.WebException e) 76 catch (WebException e)
75 { 77 {
76 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}", 78 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}",
77 e.Source, e.Message); 79 e.Source, e.Message);
@@ -153,7 +155,7 @@ namespace OpenSim.Region.Communications.OGS1
153 SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>( 155 SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
154 "POST", _inventoryServerUrl + "/NewFolder/", folder); 156 "POST", _inventoryServerUrl + "/NewFolder/", folder);
155 } 157 }
156 catch (System.Net.WebException e) 158 catch (WebException e)
157 { 159 {
158 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}", 160 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}",
159 e.Source, e.Message); 161 e.Source, e.Message);
@@ -167,7 +169,7 @@ namespace OpenSim.Region.Communications.OGS1
167 SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>( 169 SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
168 "POST", _inventoryServerUrl + "/MoveFolder/", folder); 170 "POST", _inventoryServerUrl + "/MoveFolder/", folder);
169 } 171 }
170 catch (System.Net.WebException e) 172 catch (WebException e)
171 { 173 {
172 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", 174 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}",
173 e.Source, e.Message); 175 e.Source, e.Message);
@@ -181,7 +183,7 @@ namespace OpenSim.Region.Communications.OGS1
181 SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( 183 SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
182 "POST", _inventoryServerUrl + "/NewItem/", item); 184 "POST", _inventoryServerUrl + "/NewItem/", item);
183 } 185 }
184 catch (System.Net.WebException e) 186 catch (WebException e)
185 { 187 {
186 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}", 188 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}",
187 e.Source, e.Message); 189 e.Source, e.Message);
@@ -195,7 +197,7 @@ namespace OpenSim.Region.Communications.OGS1
195 SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( 197 SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
196 "POST", _inventoryServerUrl + "/DeleteItem/", item); 198 "POST", _inventoryServerUrl + "/DeleteItem/", item);
197 } 199 }
198 catch (System.Net.WebException e) 200 catch (WebException e)
199 { 201 {
200 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}", 202 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}",
201 e.Source, e.Message); 203 e.Source, e.Message);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index c140213..56b0e8c 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -29,17 +29,18 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Reflection;
32using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
33using libsecondlife; 34using libsecondlife;
35using log4net;
34using Nwc.XmlRpc; 36using Nwc.XmlRpc;
35using OpenSim.Framework; 37using OpenSim.Framework;
36using OpenSim.Framework.Console;
37 38
38namespace OpenSim.Region.Communications.OGS1 39namespace OpenSim.Region.Communications.OGS1
39{ 40{
40 public class OGS1UserServices : IUserService 41 public class OGS1UserServices : IUserService
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 private CommunicationsOGS1 m_parent; 45 private CommunicationsOGS1 m_parent;
45 46
@@ -158,7 +159,7 @@ namespace OpenSim.Region.Communications.OGS1
158 { 159 {
159 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000); 160 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
160 } 161 }
161 catch (System.Net.WebException) 162 catch (WebException)
162 { 163 {
163 m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff"); 164 m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff");
164 } 165 }
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index a59d86a..7e096df 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -26,14 +26,11 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Collections; 29using System.Collections;
32using System.Text; 30using System.Reflection;
33using System.Xml; 31using System.Xml;
32using log4net;
34using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
35using OpenSim.Framework.Servers;
36using OpenSim.Framework.Console;
37 34
38namespace OpenSim.Region.DataSnapshot 35namespace OpenSim.Region.DataSnapshot
39{ 36{
@@ -41,7 +38,7 @@ namespace OpenSim.Region.DataSnapshot
41 { 38 {
42 private Scene m_scene = null; 39 private Scene m_scene = null;
43 private DataSnapshotManager m_externalData = null; 40 private DataSnapshotManager m_externalData = null;
44 private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 42
46 public DataRequestHandler(Scene scene, DataSnapshotManager externalData) 43 public DataRequestHandler(Scene scene, DataSnapshotManager externalData)
47 { 44 {
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index cb9ce44..682763b 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -28,18 +28,18 @@
28 28
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using System.Xml;
33using System.IO; 31using System.IO;
32using System.Net;
33using System.Reflection;
34using System.Text; 34using System.Text;
35using System.Timers; 35using System.Timers;
36using OpenSim.Framework; 36using System.Xml;
37using libsecondlife;
38using log4net;
39using Nini.Config;
37using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
38using OpenSim.Region.Environment.Interfaces; 41using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Environment.Scenes; 42using OpenSim.Region.Environment.Scenes;
40using Nini.Config;
41using libsecondlife;
42using libsecondlife.Packets;
43 43
44namespace OpenSim.Region.DataSnapshot 44namespace OpenSim.Region.DataSnapshot
45{ 45{
@@ -47,13 +47,13 @@ namespace OpenSim.Region.DataSnapshot
47 { 47 {
48 #region Class members 48 #region Class members
49 private List<Scene> m_scenes = new List<Scene>(); 49 private List<Scene> m_scenes = new List<Scene>();
50 private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 50 private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51 private bool m_enabled = false; 51 private bool m_enabled = false;
52 private bool m_configLoaded = false; 52 private bool m_configLoaded = false;
53 internal object m_syncInit = new object(); 53 internal object m_syncInit = new object();
54 private DataRequestHandler m_requests = null; 54 private DataRequestHandler m_requests = null;
55 private Dictionary<Scene, List<IDataSnapshotProvider>> m_dataproviders = new Dictionary<Scene, List<IDataSnapshotProvider>>(); 55 private Dictionary<Scene, List<IDataSnapshotProvider>> m_dataproviders = new Dictionary<Scene, List<IDataSnapshotProvider>>();
56 private Dictionary<String, String> m_gridinfo = new Dictionary<String, String>(); 56 private Dictionary<string, string> m_gridinfo = new Dictionary<string, string>();
57 //private int m_oldestSnapshot = 0; 57 //private int m_oldestSnapshot = 0;
58 private int m_maxSnapshots = 500; 58 private int m_maxSnapshots = 500;
59 private int m_lastSnapshot = 0; 59 private int m_lastSnapshot = 0;
@@ -63,7 +63,7 @@ namespace OpenSim.Region.DataSnapshot
63 private string m_hostname = "127.0.0.1"; 63 private string m_hostname = "127.0.0.1";
64 private Timer m_periodic = null; 64 private Timer m_periodic = null;
65 private int m_period = 60; // in seconds 65 private int m_period = 60; // in seconds
66 private List<String> m_disabledModules = new List<String>(); 66 private List<string> m_disabledModules = new List<string>();
67 #endregion 67 #endregion
68 68
69 #region IRegionModule 69 #region IRegionModule
@@ -72,7 +72,7 @@ namespace OpenSim.Region.DataSnapshot
72 72
73 } 73 }
74 74
75 public void Initialise(Scene scene, Nini.Config.IConfigSource config) 75 public void Initialise(Scene scene, IConfigSource config)
76 { 76 {
77 if (!m_scenes.Contains(scene)) 77 if (!m_scenes.Contains(scene))
78 m_scenes.Add(scene); 78 m_scenes.Add(scene);
@@ -495,7 +495,7 @@ namespace OpenSim.Region.DataSnapshot
495 { 495 {
496 reply = cli.Request(); 496 reply = cli.Request();
497 } 497 }
498 catch (System.Net.WebException) 498 catch (WebException)
499 { 499 {
500 m_log.Warn("[DATASNAPSHOT] Unable to notify " + url); 500 m_log.Warn("[DATASNAPSHOT] Unable to notify " + url);
501 } 501 }
@@ -514,7 +514,7 @@ namespace OpenSim.Region.DataSnapshot
514 m_log.Warn("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. " + e.StackTrace); 514 m_log.Warn("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. " + e.StackTrace);
515 } 515 }
516 // This is not quite working, so... 516 // This is not quite working, so...
517 string responseStr = System.Text.ASCIIEncoding.UTF8.GetString(response); 517 string responseStr = ASCIIEncoding.UTF8.GetString(response);
518 m_log.Info("[DATASNAPSHOT] data service notified: " + url); 518 m_log.Info("[DATASNAPSHOT] data service notified: " + url);
519 } 519 }
520 520
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
index b517c16..20ba27c 100644
--- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
@@ -26,16 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Xml; 29using System.Xml;
32using OpenSim.Region.Environment.Scenes;
33using OpenSim.Region.Environment.Modules.LandManagement;
34using OpenSim.Framework;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Communications;
37using libsecondlife; 30using libsecondlife;
38using libsecondlife.Packets; 31using OpenSim.Region.Environment.Scenes;
39 32
40namespace OpenSim.Region.DataSnapshot 33namespace OpenSim.Region.DataSnapshot
41{ 34{
diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
index 26124ce..8f580fc 100644
--- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
+++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
@@ -26,12 +26,8 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32using System.Xml; 29using System.Xml;
33using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
34using libsecondlife;
35 31
36namespace OpenSim.Region.DataSnapshot 32namespace OpenSim.Region.DataSnapshot
37{ 33{
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index a82f4be..4c17513 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -28,18 +28,14 @@
28 28
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text;
32using System.Xml;
33using System.Reflection; 31using System.Reflection;
34 32using System.Xml;
35using OpenSim.Region.Environment.Scenes;
36using OpenSim.Region.Environment.Modules.LandManagement;
37using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Framework;
39using OpenSim.Framework.Console;
40using OpenSim.Framework.Communications;
41using libsecondlife; 33using libsecondlife;
42using libsecondlife.Packets; 34using log4net;
35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Modules.LandManagement;
38using OpenSim.Region.Environment.Scenes;
43 39
44namespace OpenSim.Region.DataSnapshot 40namespace OpenSim.Region.DataSnapshot
45{ 41{
@@ -48,7 +44,7 @@ namespace OpenSim.Region.DataSnapshot
48 private Scene m_scene = null; 44 private Scene m_scene = null;
49 private DataSnapshotManager m_parent = null; 45 private DataSnapshotManager m_parent = null;
50 //private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>(); 46 //private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>();
51 private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 48
53 #region Dead code 49 #region Dead code
54 50
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 353a02b..d48ecfd 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.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;
30using System.Text;
31using System.Xml;
32using System.Reflection; 28using System.Reflection;
29using System.Xml;
30using log4net;
33using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
34using OpenSim.Framework;
35using libsecondlife;
36 32
37namespace OpenSim.Region.DataSnapshot 33namespace OpenSim.Region.DataSnapshot
38{ 34{
@@ -40,7 +36,7 @@ namespace OpenSim.Region.DataSnapshot
40 { 36 {
41 private Scene m_scene = null; 37 private Scene m_scene = null;
42 private DataSnapshotManager m_parent = null; 38 private DataSnapshotManager m_parent = null;
43 private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 40
45 public void Initialize(Scene scene, DataSnapshotManager parent) 41 public void Initialize(Scene scene, DataSnapshotManager parent)
46 { 42 {
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index ba4f0c6..b3ffd10 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -27,11 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using libsecondlife.Packets; 32using libsecondlife.Packets;
33using log4net;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Console;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
36 36
37namespace OpenSim.Region.Environment 37namespace OpenSim.Region.Environment
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment
41 /// </summary> 41 /// </summary>
42 public class EstateManager 42 public class EstateManager
43 { 43 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 private Scene m_scene; 46 private Scene m_scene;
47 private RegionInfo m_regInfo; 47 private RegionInfo m_regInfo;
diff --git a/OpenSim/Region/Environment/Interfaces/ICommand.cs b/OpenSim/Region/Environment/Interfaces/ICommand.cs
index c119736..4eeb16c 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommand.cs
+++ b/OpenSim/Region/Environment/Interfaces/ICommand.cs
@@ -25,16 +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.Collections.Generic;
29
30using OpenSim.Region.Environment.Modules.ModuleFramework;
31 29
32namespace OpenSim.Region.Environment.Interfaces 30namespace OpenSim.Region.Environment.Interfaces
33{ 31{
34 public interface ICommand 32 public interface ICommand
35 { 33 {
36 void AddArgument(string name, string helptext, string type); 34 void AddArgument(string name, string helptext, string type);
37 System.Collections.Generic.Dictionary<string, string> Arguments { get; } 35 Dictionary<string, string> Arguments { get; }
38 string Help { get; } 36 string Help { get; }
39 string Name { get; } 37 string Name { get; }
40 void Run(object[] args); 38 void Run(object[] args);
diff --git a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs b/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs
index 067c43a..c4ed942 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs
@@ -25,12 +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
32using OpenSim.Region.Environment.Modules.ModuleFramework;
33
34namespace OpenSim.Region.Environment.Interfaces 28namespace OpenSim.Region.Environment.Interfaces
35{ 29{
36 public interface ICommandableModule 30 public interface ICommandableModule
diff --git a/OpenSim/Region/Environment/Interfaces/ICommander.cs b/OpenSim/Region/Environment/Interfaces/ICommander.cs
index 7cc6ffb..c4102af 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommander.cs
+++ b/OpenSim/Region/Environment/Interfaces/ICommander.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;
29
30using OpenSim.Region.Environment.Modules.ModuleFramework;
31
32namespace OpenSim.Region.Environment.Interfaces 28namespace OpenSim.Region.Environment.Interfaces
33{ 29{
34 public interface ICommander 30 public interface ICommander
diff --git a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
index 98bab63..464a213 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
@@ -25,14 +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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31
32using libsecondlife; 29using libsecondlife;
33using libsecondlife.Packets; 30using libsecondlife.Packets;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes;
36 33
37namespace OpenSim.Region.Environment.Interfaces 34namespace OpenSim.Region.Environment.Interfaces
38{ 35{
diff --git a/OpenSim/Region/Environment/Interfaces/ILandObject.cs b/OpenSim/Region/Environment/Interfaces/ILandObject.cs
index 33ccddc..420ffc3 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandObject.cs
+++ b/OpenSim/Region/Environment/Interfaces/ILandObject.cs
@@ -25,15 +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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31
32using libsecondlife; 29using libsecondlife;
33using libsecondlife.Packets; 30using libsecondlife.Packets;
34using OpenSim.Region.Environment.Scenes;
35
36using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes;
37 33
38namespace OpenSim.Region.Environment.Interfaces 34namespace OpenSim.Region.Environment.Interfaces
39{ 35{
diff --git a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs b/OpenSim/Region/Environment/Interfaces/ITextureSender.cs
index f262b9a..1b9e4eb 100644
--- a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs
+++ b/OpenSim/Region/Environment/Interfaces/ITextureSender.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.Region.Environment.Interfaces 28namespace OpenSim.Region.Environment.Interfaces
31{ 29{
32 /// <summary> 30 /// <summary>
diff --git a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
index 358b56f..c7f1001 100644
--- a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
@@ -27,8 +27,6 @@
27 27
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Region.Environment.Modules; 29using OpenSim.Region.Environment.Modules;
30using System.Collections;
31using System.Collections.Generic;
32 30
33namespace OpenSim.Region.Environment.Interfaces 31namespace OpenSim.Region.Environment.Interfaces
34{ 32{
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index 7fb8d8a..43ca7bd 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using log4net;
32using Nini.Config; 33using Nini.Config;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules; 35using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Environment.Scenes;
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment
39{ 39{
40 public class ModuleLoader 40 public class ModuleLoader
41 { 41 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>(); 44 public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>();
45 45
diff --git a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
index 7ae3eba..cec7192 100644
--- a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
+++ b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
@@ -27,7 +27,9 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using Nini.Config; 33using Nini.Config;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
@@ -129,8 +131,8 @@ namespace OpenSim.Region.Environment.Modules
129 //should merge this classes and clean up 131 //should merge this classes and clean up
130 public class AgentAssetTransactionsManager 132 public class AgentAssetTransactionsManager
131 { 133 {
132 private static readonly log4net.ILog m_log 134 private static readonly ILog m_log
133 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 135 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
134 136
135 // Fields 137 // Fields
136 public Scene MyScene; 138 public Scene MyScene;
diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
index d5f1b36..97db31e 100644
--- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.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.Threading;
31using libsecondlife; 29using libsecondlife;
32using libsecondlife.Packets; 30using libsecondlife.Packets;
33using Nini.Config; 31using Nini.Config;
diff --git a/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs
index 52b9c3e..1b537c2 100644
--- a/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs
@@ -27,24 +27,25 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32using Nini.Config; 33using Nini.Config;
33using Nwc.XmlRpc; 34using Nwc.XmlRpc;
34using OpenSim.Framework; 35using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
37using OpenSim.Region.Capabilities; 38using OpenSim.Region.Capabilities;
38using Caps = OpenSim.Region.Capabilities.Caps;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Environment.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Environment.Scenes;
41using Caps=OpenSim.Region.Capabilities.Caps;
41 42
42namespace OpenSim.Region.Environment.Modules 43namespace OpenSim.Region.Environment.Modules
43{ 44{
44 public class AsteriskVoiceModule : IRegionModule 45 public class AsteriskVoiceModule : IRegionModule
45 { 46 {
46 private static readonly log4net.ILog m_log = 47 private static readonly ILog m_log =
47 log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 49
49 private Scene m_scene; 50 private Scene m_scene;
50 private IConfig m_config; 51 private IConfig m_config;
diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
index e3ad297..44b3f8b 100644
--- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
@@ -25,7 +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.Reflection;
28using libsecondlife; 30using libsecondlife;
31using log4net;
29using Nini.Config; 32using Nini.Config;
30using OpenSim.Framework; 33using OpenSim.Framework;
31using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
@@ -35,7 +38,7 @@ namespace OpenSim.Region.Environment.Modules
35{ 38{
36 public class AvatarProfilesModule : IRegionModule 39 public class AvatarProfilesModule : IRegionModule
37 { 40 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 private Scene m_scene; 42 private Scene m_scene;
40 43
41 public AvatarProfilesModule() 44 public AvatarProfilesModule()
@@ -92,8 +95,8 @@ namespace OpenSim.Region.Environment.Modules
92 { 95 {
93 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, 96 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
94 Util.ToDateTime(profile.Created).ToString(), 97 Util.ToDateTime(profile.Created).ToString(),
95 System.String.Empty, profile.FirstLifeAboutText, profile.CanDoMask, 98 String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
96 profile.FirstLifeImage, profile.Image, System.String.Empty, partner); 99 profile.FirstLifeImage, profile.Image, String.Empty, partner);
97 } 100 }
98 else 101 else
99 { 102 {
diff --git a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
index 0748719..d5b2ea2 100644
--- a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
@@ -30,16 +30,15 @@ using 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.Xml; 34using System.Xml;
34using libsecondlife; 35using libsecondlife;
36using log4net;
35using Nini.Config; 37using Nini.Config;
38using Nwc.XmlRpc;
36using OpenSim.Framework; 39using OpenSim.Framework;
37using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Environment.Scenes;
39using Nwc.XmlRpc;
40
41using MoneyTransferArgs = OpenSim.Region.Environment.Scenes.EventManager.MoneyTransferArgs;
42using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs;
43 42
44namespace OpenSim.Region.Environment.Modules 43namespace OpenSim.Region.Environment.Modules
45{ 44{
@@ -56,7 +55,7 @@ namespace OpenSim.Region.Environment.Modules
56 /// </summary> 55 /// </summary>
57 public class BetaGridLikeMoneyModule: IRegionModule 56 public class BetaGridLikeMoneyModule: IRegionModule
58 { 57 {
59 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 58 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
60 59
61 /// <summary> 60 /// <summary>
62 /// Region UUIDS indexed by AgentID 61 /// Region UUIDS indexed by AgentID
@@ -341,7 +340,7 @@ namespace OpenSim.Region.Environment.Modules
341 } 340 }
342 } 341 }
343 342
344 private void ValidateLandBuy (Object osender, LandBuyArgs e) 343 private void ValidateLandBuy (Object osender, EventManager.LandBuyArgs e)
345 { 344 {
346 if (m_MoneyAddress.Length == 0) 345 if (m_MoneyAddress.Length == 0)
347 { 346 {
@@ -372,7 +371,7 @@ namespace OpenSim.Region.Environment.Modules
372 } 371 }
373 } 372 }
374 373
375 private void processLandBuy(Object osender, LandBuyArgs e) 374 private void processLandBuy(Object osender, EventManager.LandBuyArgs e)
376 { 375 {
377 lock(e) 376 lock(e)
378 { 377 {
@@ -396,7 +395,7 @@ namespace OpenSim.Region.Environment.Modules
396 /// </summary> 395 /// </summary>
397 /// <param name="osender"></param> 396 /// <param name="osender"></param>
398 /// <param name="e"></param> 397 /// <param name="e"></param>
399 private void MoneyTransferAction (Object osender, MoneyTransferArgs e) 398 private void MoneyTransferAction (Object osender, EventManager.MoneyTransferArgs e)
400 { 399 {
401 IClientAPI sender = null; 400 IClientAPI sender = null;
402 IClientAPI receiver = null; 401 IClientAPI receiver = null;
@@ -724,7 +723,7 @@ namespace OpenSim.Region.Environment.Modules
724 { 723 {
725 returnfunds = GetFundsForAgentID(agentID); 724 returnfunds = GetFundsForAgentID(agentID);
726 } 725 }
727 catch (System.Exception e) 726 catch (Exception e)
728 { 727 {
729 client.SendAlertMessage(e.Message + " "); 728 client.SendAlertMessage(e.Message + " ");
730 } 729 }
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index f854409..30c1397 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -29,9 +29,11 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net.Sockets; 31using System.Net.Sockets;
32using System.Reflection;
32using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
33using System.Threading; 34using System.Threading;
34using libsecondlife; 35using libsecondlife;
36using log4net;
35using Nini.Config; 37using Nini.Config;
36using OpenSim.Framework; 38using OpenSim.Framework;
37using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Environment.Interfaces;
@@ -41,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules
41{ 43{
42 public class ChatModule : IRegionModule, ISimChat 44 public class ChatModule : IRegionModule, ISimChat
43 { 45 {
44 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);
45 47
46 private List<Scene> m_scenes = new List<Scene>(); 48 private List<Scene> m_scenes = new List<Scene>();
47 49
@@ -116,7 +118,7 @@ namespace OpenSim.Region.Environment.Modules
116 if (!m_irc_connector.IsAlive) 118 if (!m_irc_connector.IsAlive)
117 { 119 {
118 m_irc_connector.Start(); 120 m_irc_connector.Start();
119 OpenSim.Framework.ThreadTracker.Add(m_irc_connector); 121 ThreadTracker.Add(m_irc_connector);
120 } 122 }
121 } 123 }
122 catch (Exception) 124 catch (Exception)
@@ -267,7 +269,7 @@ namespace OpenSim.Region.Environment.Modules
267 if (!m_irc_connector.IsAlive) 269 if (!m_irc_connector.IsAlive)
268 { 270 {
269 m_irc_connector.Start(); 271 m_irc_connector.Start();
270 OpenSim.Framework.ThreadTracker.Add(m_irc_connector); 272 ThreadTracker.Add(m_irc_connector);
271 } 273 }
272 } 274 }
273 catch (Exception) 275 catch (Exception)
@@ -336,7 +338,7 @@ namespace OpenSim.Region.Environment.Modules
336 338
337 internal class IRCChatModule 339 internal class IRCChatModule
338 { 340 {
339 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 341 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
340 342
341 private string m_server = null; 343 private string m_server = null;
342 private uint m_port = 6668; 344 private uint m_port = 6668;
@@ -431,13 +433,13 @@ namespace OpenSim.Region.Environment.Modules
431 pingSender.Name = "PingSenderThread"; 433 pingSender.Name = "PingSenderThread";
432 pingSender.IsBackground = true; 434 pingSender.IsBackground = true;
433 pingSender.Start(); 435 pingSender.Start();
434 OpenSim.Framework.ThreadTracker.Add(pingSender); 436 ThreadTracker.Add(pingSender);
435 437
436 listener = new Thread(new ThreadStart(ListenerRun)); 438 listener = new Thread(new ThreadStart(ListenerRun));
437 listener.Name = "IRCChatModuleListenerThread"; 439 listener.Name = "IRCChatModuleListenerThread";
438 listener.IsBackground = true; 440 listener.IsBackground = true;
439 listener.Start(); 441 listener.Start();
440 OpenSim.Framework.ThreadTracker.Add(listener); 442 ThreadTracker.Add(listener);
441 443
442 m_writer.WriteLine(m_user); 444 m_writer.WriteLine(m_user);
443 m_writer.Flush(); 445 m_writer.Flush();
diff --git a/OpenSim/Region/Environment/Modules/CommanderTestModule.cs b/OpenSim/Region/Environment/Modules/CommanderTestModule.cs
index 0133f27..a30de73 100644
--- a/OpenSim/Region/Environment/Modules/CommanderTestModule.cs
+++ b/OpenSim/Region/Environment/Modules/CommanderTestModule.cs
@@ -26,13 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using libsecondlife;
31using Nini.Config; 29using Nini.Config;
32using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 30using OpenSim.Region.Environment.Interfaces;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Region.Environment.Modules.ModuleFramework; 31using OpenSim.Region.Environment.Modules.ModuleFramework;
32using OpenSim.Region.Environment.Scenes;
36 33
37namespace OpenSim.Region.Environment.Modules 34namespace OpenSim.Region.Environment.Modules
38{ 35{
diff --git a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
index ee84499..02354f1 100644
--- a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
+++ b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
@@ -26,14 +26,15 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Drawing;
30using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing;
31using System.Drawing.Imaging;
31using libsecondlife; 32using libsecondlife;
32using Nini.Config; 33using Nini.Config;
34using OpenJPEGNet;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Environment.Scenes;
36using OpenJPEGNet;
37 38
38namespace OpenSim.Region.Environment.Modules 39namespace OpenSim.Region.Environment.Modules
39{ 40{
@@ -252,7 +253,7 @@ namespace OpenSim.Region.Environment.Modules
252 Bitmap joint; 253 Bitmap joint;
253 Graphics jG; 254 Graphics jG;
254 255
255 joint = new Bitmap(back.Width, back.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb); 256 joint = new Bitmap(back.Width, back.Height, PixelFormat.Format32bppArgb);
256 jG = Graphics.FromImage(joint); 257 jG = Graphics.FromImage(joint);
257 258
258 jG.DrawImage(back, 0, 0, back.Width, back.Height); 259 jG.DrawImage(back, 0, 0, back.Width, back.Height);
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
index 0faa573..f811f22 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
@@ -27,18 +27,15 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.IO;
31using libsecondlife;
32using Nini.Config; 31using Nini.Config;
33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Scenes;
36using OpenSim.Region.Environment.Modules.ModuleFramework; 33using OpenSim.Region.Environment.Modules.ModuleFramework;
37using System.IO; 34using OpenSim.Region.Environment.Scenes;
38 35
39namespace OpenSim.Region.Environment.Modules.ExportSerialiser 36namespace OpenSim.Region.Environment.Modules.ExportSerialiser
40{ 37{
41 public class ExportSerialisationModule : IRegionModule, OpenSim.Region.Environment.Modules.ExportSerialiser.IRegionSerialiser 38 public class ExportSerialisationModule : IRegionModule, IRegionSerialiser
42 { 39 {
43 private List<Scene> m_regions = new List<Scene>(); 40 private List<Scene> m_regions = new List<Scene>();
44 private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>(); 41 private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>();
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs
index f13c8fa..8cd97a8 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.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
32using OpenSim.Region.Environment.Scenes; 28using OpenSim.Region.Environment.Scenes;
33 29
34namespace OpenSim.Region.Environment.Modules.ExportSerialiser 30namespace OpenSim.Region.Environment.Modules.ExportSerialiser
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
index a9454fc..5b10957 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
@@ -25,11 +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.Collections.Generic;
29using OpenSim.Region.Environment.Scenes;
30
29namespace OpenSim.Region.Environment.Modules.ExportSerialiser 31namespace OpenSim.Region.Environment.Modules.ExportSerialiser
30{ 32{
31 public interface IRegionSerialiser 33 public interface IRegionSerialiser
32 { 34 {
33 System.Collections.Generic.List<string> SerialiseRegion(OpenSim.Region.Environment.Scenes.Scene scene, string saveDir); 35 List<string> SerialiseRegion(Scene scene, string saveDir);
34 } 36 }
35} 37}
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
index e413466..ac80f40 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
@@ -25,10 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Scenes;
29using System.IO;
30using System.Collections.Generic; 28using System.Collections.Generic;
29using System.IO;
30using System.Text;
31using System.Xml; 31using System.Xml;
32using OpenSim.Region.Environment.Scenes;
32 33
33namespace OpenSim.Region.Environment.Modules.ExportSerialiser 34namespace OpenSim.Region.Environment.Modules.ExportSerialiser
34{ 35{
@@ -61,7 +62,7 @@ namespace OpenSim.Region.Environment.Modules.ExportSerialiser
61 xmlstream += "</scene>"; 62 xmlstream += "</scene>";
62 63
63 MemoryStream stream = new MemoryStream(); 64 MemoryStream stream = new MemoryStream();
64 XmlTextWriter formatter = new XmlTextWriter(stream, System.Text.Encoding.UTF8); 65 XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
65 XmlDocument doc = new XmlDocument(); 66 XmlDocument doc = new XmlDocument();
66 67
67 doc.LoadXml(xmlstream); 68 doc.LoadXml(xmlstream);
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
index eeeacdc..8555089 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Modules.Terrain; 28using OpenSim.Region.Environment.Modules.Terrain;
29using OpenSim.Region.Environment.Modules.Terrain.FileLoaders;
29using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
30 31
31namespace OpenSim.Region.Environment.Modules.ExportSerialiser 32namespace OpenSim.Region.Environment.Modules.ExportSerialiser
@@ -36,7 +37,7 @@ namespace OpenSim.Region.Environment.Modules.ExportSerialiser
36 37
37 public string WriteToFile(Scene scene, string dir) 38 public string WriteToFile(Scene scene, string dir)
38 { 39 {
39 ITerrainLoader fileSystemExporter = new Terrain.FileLoaders.RAW32(); 40 ITerrainLoader fileSystemExporter = new RAW32();
40 string targetFileName = dir + "heightmap.r32"; 41 string targetFileName = dir + "heightmap.r32";
41 42
42 lock (scene.Heightmap) 43 lock (scene.Heightmap)
diff --git a/OpenSim/Region/Environment/Modules/FriendsModule.cs b/OpenSim/Region/Environment/Modules/FriendsModule.cs
index a2ec599..7e12618 100644
--- a/OpenSim/Region/Environment/Modules/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/FriendsModule.cs
@@ -26,8 +26,10 @@
26 */ 26 */
27using System; 27using System;
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
29using libsecondlife; 30using libsecondlife;
30using libsecondlife.Packets; 31using libsecondlife.Packets;
32using log4net;
31using Nini.Config; 33using Nini.Config;
32using Nwc.XmlRpc; 34using Nwc.XmlRpc;
33using OpenSim.Framework; 35using OpenSim.Framework;
@@ -38,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules
38{ 40{
39 public class FriendsModule : IRegionModule 41 public class FriendsModule : IRegionModule
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 List<Scene> m_scene = new List<Scene>(); 45 private List<Scene> m_scene = new List<Scene>();
44 46
diff --git a/OpenSim/Region/Environment/Modules/GroupsModule.cs b/OpenSim/Region/Environment/Modules/GroupsModule.cs
index 6cdae7b..b23bb91 100644
--- a/OpenSim/Region/Environment/Modules/GroupsModule.cs
+++ b/OpenSim/Region/Environment/Modules/GroupsModule.cs
@@ -27,7 +27,9 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using Nini.Config; 33using Nini.Config;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
@@ -37,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules
37{ 39{
38 public class GroupsModule : IRegionModule 40 public class GroupsModule : IRegionModule
39 { 41 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 43
42 private List<Scene> m_scene = new List<Scene>(); 44 private List<Scene> m_scene = new List<Scene>();
43 private Dictionary<LLUUID, IClientAPI> m_iclientmap = new Dictionary<LLUUID, IClientAPI>(); 45 private Dictionary<LLUUID, IClientAPI> m_iclientmap = new Dictionary<LLUUID, IClientAPI>();
diff --git a/OpenSim/Region/Environment/Modules/InventoryModule.cs b/OpenSim/Region/Environment/Modules/InventoryModule.cs
index eadbb4f..ff5a02c 100644
--- a/OpenSim/Region/Environment/Modules/InventoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/InventoryModule.cs
@@ -25,12 +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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30 29using System.Reflection;
31using libsecondlife; 30using libsecondlife;
31using log4net;
32using Nini.Config; 32using Nini.Config;
33
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
36using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
@@ -39,8 +38,8 @@ namespace OpenSim.Region.Environment.Modules
39{ 38{
40 public class InventoryModule : IRegionModule 39 public class InventoryModule : IRegionModule
41 { 40 {
42 private static readonly log4net.ILog m_log 41 private static readonly ILog m_log
43 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 43
45 private Scene m_scene; 44 private Scene m_scene;
46 45
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
index e3b7cf5..561c5cf 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
@@ -27,18 +27,14 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using Axiom.Math; 30using Axiom.Math;
32using libsecondlife; 31using libsecondlife;
33using libsecondlife.Packets; 32using libsecondlife.Packets;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Framework.Console;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Scenes;
38using OpenSim.Region.Physics.Manager; 36using OpenSim.Region.Physics.Manager;
39 37
40using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs;
41
42namespace OpenSim.Region.Environment.Modules.LandManagement 38namespace OpenSim.Region.Environment.Modules.LandManagement
43{ 39{
44 public class LandChannel : ILandChannel 40 public class LandChannel : ILandChannel
@@ -245,7 +241,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
245 x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / Convert.ToDouble(4.0))); 241 x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / Convert.ToDouble(4.0)));
246 y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / Convert.ToDouble(4.0))); 242 y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / Convert.ToDouble(4.0)));
247 } 243 }
248 catch (System.OverflowException) 244 catch (OverflowException)
249 { 245 {
250 return null; 246 return null;
251 } 247 }
@@ -957,7 +953,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
957 // and land has been validated as well, this method transfers 953 // and land has been validated as well, this method transfers
958 // the land ownership 954 // the land ownership
959 955
960 public void handleLandBuyRequest(Object o, LandBuyArgs e) 956 public void handleLandBuyRequest(Object o, EventManager.LandBuyArgs e)
961 { 957 {
962 if (e.economyValidated && e.landValidated) 958 if (e.economyValidated && e.landValidated)
963 { 959 {
@@ -976,7 +972,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
976 // be validated. This method validates the right to buy the 972 // be validated. This method validates the right to buy the
977 // parcel 973 // parcel
978 974
979 public void handleLandValidationRequest(Object o, LandBuyArgs e) 975 public void handleLandValidationRequest(Object o, EventManager.LandBuyArgs e)
980 { 976 {
981 if (e.landValidated == false) 977 if (e.landValidated == false)
982 { 978 {
@@ -994,7 +990,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
994 int saleprice = lob.landData.salePrice; 990 int saleprice = lob.landData.salePrice;
995 LLUUID pOwnerID = lob.landData.ownerID; 991 LLUUID pOwnerID = lob.landData.ownerID;
996 992
997 bool landforsale = ((lob.landData.landFlags & (uint)(libsecondlife.Parcel.ParcelFlags.ForSale | libsecondlife.Parcel.ParcelFlags.ForSaleObjects | libsecondlife.Parcel.ParcelFlags.SellParcelObjects)) != 0); 993 bool landforsale = ((lob.landData.landFlags & (uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects)) != 0);
998 if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale) 994 if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale)
999 { 995 {
1000 lock (e) 996 lock (e)
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
index 20f75df..1c36c0c 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.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.Generic;
30using libsecondlife;
31using libsecondlife.Packets;
32using OpenSim.Framework;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Region.Environment.Interfaces;
36using Nini.Config; 28using Nini.Config;
37 29using OpenSim.Region.Environment.Interfaces;
38using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs; 30using OpenSim.Region.Environment.Scenes;
39 31
40namespace OpenSim.Region.Environment.Modules.LandManagement 32namespace OpenSim.Region.Environment.Modules.LandManagement
41{ 33{
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
index 69d3c05..f9684e6 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
@@ -27,12 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
31using libsecondlife.Packets; 32using libsecondlife.Packets;
33using log4net;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
36using OpenSim.Region.Environment.Scenes;
36 37
37namespace OpenSim.Region.Environment.Modules.LandManagement 38namespace OpenSim.Region.Environment.Modules.LandManagement
38{ 39{
@@ -46,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
46 { 47 {
47 #region Member Variables 48 #region Member Variables
48 49
49 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 51
51 protected LandData m_landData = new LandData(); 52 protected LandData m_landData = new LandData();
52 protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>(); 53 protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
@@ -273,7 +274,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
273 newData.claimPrice = claimprice; 274 newData.claimPrice = claimprice;
274 newData.salePrice = 0; 275 newData.salePrice = 0;
275 newData.authBuyerID = LLUUID.Zero; 276 newData.authBuyerID = LLUUID.Zero;
276 newData.landFlags &= ~(uint)(libsecondlife.Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects); 277 newData.landFlags &= ~(uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects);
277 m_scene.LandChannel.updateLandObject(landData.localID, newData); 278 m_scene.LandChannel.updateLandObject(landData.localID, newData);
278 279
279 sendLandUpdateToAvatarsOverMe(); 280 sendLandUpdateToAvatarsOverMe();
diff --git a/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs b/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
index 9834a8a..27d73b5 100644
--- a/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
+++ b/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
@@ -27,8 +27,10 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using System.Text; 31using System.Text;
31 32using log4net;
33using OpenSim.Framework;
32using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
33 35
34namespace OpenSim.Region.Environment.Modules.ModuleFramework 36namespace OpenSim.Region.Environment.Modules.ModuleFramework
@@ -39,9 +41,9 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
39 /// </summary> 41 /// </summary>
40 public class Command : ICommand 42 public class Command : ICommand
41 { 43 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 45
44 private Action<Object[]> m_command; 46 private Action<object[]> m_command;
45 private string m_name; 47 private string m_name;
46 private string m_help; 48 private string m_help;
47 private List<CommandArgument> m_args = new List<CommandArgument>(); 49 private List<CommandArgument> m_args = new List<CommandArgument>();
@@ -197,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
197 /// </summary> 199 /// </summary>
198 public class Commander : ICommander 200 public class Commander : ICommander
199 { 201 {
200 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 202 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
201 private Dictionary<string, ICommand> m_commands = new Dictionary<string, ICommand>(); 203 private Dictionary<string, ICommand> m_commands = new Dictionary<string, ICommand>();
202 private string m_name; 204 private string m_name;
203 205
@@ -241,7 +243,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
241 classSrc += "\tpublic void " + EscapeRuntimeAPICommand(com.Name) + "( "; 243 classSrc += "\tpublic void " + EscapeRuntimeAPICommand(com.Name) + "( ";
242 foreach (KeyValuePair<string, string> arg in com.Arguments) 244 foreach (KeyValuePair<string, string> arg in com.Arguments)
243 { 245 {
244 classSrc += arg.Value + " " + Framework.Util.Md5Hash(arg.Key) + ","; 246 classSrc += arg.Value + " " + Util.Md5Hash(arg.Key) + ",";
245 } 247 }
246 classSrc = classSrc.Remove(classSrc.Length - 1); // Delete the last comma 248 classSrc = classSrc.Remove(classSrc.Length - 1); // Delete the last comma
247 classSrc += " )\n\t{\n"; 249 classSrc += " )\n\t{\n";
@@ -249,7 +251,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
249 int i = 0; 251 int i = 0;
250 foreach (KeyValuePair<string, string> arg in com.Arguments) 252 foreach (KeyValuePair<string, string> arg in com.Arguments)
251 { 253 {
252 classSrc += "\t\targs[" + i.ToString() + "] = " + Framework.Util.Md5Hash(arg.Key) + " " + ";\n"; 254 classSrc += "\t\targs[" + i.ToString() + "] = " + Util.Md5Hash(arg.Key) + " " + ";\n";
253 i++; 255 i++;
254 } 256 }
255 classSrc += "\t\tGetCommander(\"" + m_name + "\").Run(\"" + com.Name + "\", args);\n"; 257 classSrc += "\t\tGetCommander(\"" + m_name + "\").Run(\"" + com.Name + "\", args);\n";
diff --git a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
index 10e3840..2de5975 100644
--- a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
@@ -33,6 +33,7 @@ using System.Text;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using libsecondlife;
35using Nini.Config; 35using Nini.Config;
36using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
38 39
@@ -289,7 +290,7 @@ namespace OpenSim.Region.Environment.Modules
289 httpThread.IsBackground = true; 290 httpThread.IsBackground = true;
290 finished = false; 291 finished = false;
291 httpThread.Start(); 292 httpThread.Start();
292 OpenSim.Framework.ThreadTracker.Add(httpThread); 293 ThreadTracker.Add(httpThread);
293 } 294 }
294 295
295 /* 296 /*
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 1d32c1f..bde0dc0 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Modules
74 m_thread.Name = "ProcessTextureSenderThread"; 74 m_thread.Name = "ProcessTextureSenderThread";
75 m_thread.IsBackground = true; 75 m_thread.IsBackground = true;
76 m_thread.Start(); 76 m_thread.Start();
77 OpenSim.Framework.ThreadTracker.Add(m_thread); 77 ThreadTracker.Add(m_thread);
78 } 78 }
79 79
80 if (!m_scenes.Contains(scene)) 80 if (!m_scenes.Contains(scene))
diff --git a/OpenSim/Region/Environment/Modules/TextureSender.cs b/OpenSim/Region/Environment/Modules/TextureSender.cs
index 1500bdb..e54a1a2 100644
--- a/OpenSim/Region/Environment/Modules/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/TextureSender.cs
@@ -26,10 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using System.Reflection;
30using libsecondlife.Packets; 30using libsecondlife.Packets;
31using log4net;
31using OpenSim.Framework; 32using OpenSim.Framework;
32using OpenSim.Framework.Console;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Environment.Interfaces;
34 34
35namespace OpenSim.Region.Environment.Modules 35namespace OpenSim.Region.Environment.Modules
@@ -40,8 +40,8 @@ namespace OpenSim.Region.Environment.Modules
40 /// </summary> 40 /// </summary>
41 public class TextureSender : ITextureSender 41 public class TextureSender : ITextureSender
42 { 42 {
43 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
44 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 /// <summary> 46 /// <summary>
47 /// Records the number of times texture send has been called. 47 /// Records the number of times texture send has been called.
diff --git a/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
index ec977ba..2051a0f 100644
--- a/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
@@ -27,10 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
31using System.Timers;
32using Axiom.Math;
30using libsecondlife; 33using libsecondlife;
34using log4net;
31using Nini.Config; 35using Nini.Config;
32using OpenSim.Framework; 36using OpenSim.Framework;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
36 39
@@ -42,7 +45,7 @@ namespace OpenSim.Region.Environment.Modules
42 public class TreePopulatorModule : IRegionModule 45 public class TreePopulatorModule : IRegionModule
43 { 46 {
44 private Scene m_scene; 47 private Scene m_scene;
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 49
47 private List<LLUUID> m_trees; 50 private List<LLUUID> m_trees;
48 51
@@ -63,8 +66,8 @@ namespace OpenSim.Region.Environment.Modules
63 66
64 m_scene.EventManager.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(EventManager_OnPluginConsole); 67 m_scene.EventManager.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(EventManager_OnPluginConsole);
65 68
66 System.Timers.Timer CalculateTrees = new System.Timers.Timer(m_tree_updates); 69 Timer CalculateTrees = new Timer(m_tree_updates);
67 CalculateTrees.Elapsed += new System.Timers.ElapsedEventHandler(CalculateTrees_Elapsed); 70 CalculateTrees.Elapsed += new ElapsedEventHandler(CalculateTrees_Elapsed);
68 CalculateTrees.Start(); 71 CalculateTrees.Start();
69 m_log.Debug("[TREES]: Initialised tree module"); 72 m_log.Debug("[TREES]: Initialised tree module");
70 } 73 }
@@ -168,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules
168 } 171 }
169 else 172 else
170 { 173 {
171 selectedTree.SetText(killLikelyhood.ToString(), new Axiom.Math.Vector3(1.0f, 1.0f, 1.0f), 1.0); 174 selectedTree.SetText(killLikelyhood.ToString(), new Vector3(1.0f, 1.0f, 1.0f), 1.0);
172 } 175 }
173 } 176 }
174 else 177 else
@@ -217,7 +220,7 @@ namespace OpenSim.Region.Environment.Modules
217 tree.SendGroupFullUpdate(); 220 tree.SendGroupFullUpdate();
218 } 221 }
219 222
220 void CalculateTrees_Elapsed(object sender, System.Timers.ElapsedEventArgs e) 223 void CalculateTrees_Elapsed(object sender, ElapsedEventArgs e)
221 { 224 {
222 growTrees(); 225 growTrees();
223 seedTrees(); 226 seedTrees();
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index 59ec981..b487628 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -25,15 +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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30 29using System.Reflection;
31using libsecondlife; 30using libsecondlife;
32using libsecondlife.Packets; 31using log4net;
33
34using OpenSim.Framework; 32using OpenSim.Framework;
35using OpenSim.Framework.Communications.Limit; 33using OpenSim.Framework.Communications.Limit;
36using OpenSim.Framework.Console;
37using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
39 36
@@ -46,8 +43,8 @@ namespace OpenSim.Region.Environment.Modules
46 /// </summary> 43 /// </summary>
47 public class UserTextureDownloadService 44 public class UserTextureDownloadService
48 { 45 {
49 private static readonly log4net.ILog m_log 46 private static readonly ILog m_log
50 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51 48
52 /// <summary> 49 /// <summary>
53 /// We will allow the client to request the same texture n times before dropping further requests 50 /// We will allow the client to request the same texture n times before dropping further requests
diff --git a/OpenSim/Region/Environment/Modules/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
index 9c91b25..0ea6fc3 100644
--- a/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
+++ b/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
@@ -27,15 +27,17 @@
27 27
28using System; 28using System;
29using System.Drawing; 29using System.Drawing;
30using System.Drawing.Imaging;
31using System.Globalization;
30using System.IO; 32using System.IO;
31using System.Net; 33using System.Net;
32using System.Globalization;
33using libsecondlife; 34using libsecondlife;
34using Nini.Config; 35using Nini.Config;
35using OpenJPEGNet; 36using OpenJPEGNet;
36using OpenSim.Framework;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
39using Image=System.Drawing.Image;
40
39//using Cairo; 41//using Cairo;
40 42
41namespace OpenSim.Region.Environment.Modules 43namespace OpenSim.Region.Environment.Modules
@@ -96,9 +98,9 @@ namespace OpenSim.Region.Environment.Modules
96 if ((size < 128) || (size > 1024)) 98 if ((size < 128) || (size > 1024))
97 size = 256; 99 size = 256;
98 100
99 Bitmap bitmap = new Bitmap(size, size, System.Drawing.Imaging.PixelFormat.Format32bppArgb); 101 Bitmap bitmap = new Bitmap(size, size, PixelFormat.Format32bppArgb);
100 102
101 System.Drawing.Graphics graph = System.Drawing.Graphics.FromImage(bitmap); 103 Graphics graph = Graphics.FromImage(bitmap);
102 104
103 extraParams = extraParams.ToLower(); 105 extraParams = extraParams.ToLower();
104 int alpha = 255; 106 int alpha = 255;
@@ -166,11 +168,11 @@ namespace OpenSim.Region.Environment.Modules
166 } 168 }
167*/ 169*/
168 170
169 private void GDIDraw(string data, System.Drawing.Graphics graph) 171 private void GDIDraw(string data, Graphics graph)
170 { 172 {
171 System.Drawing.Point startPoint = new System.Drawing.Point(0, 0); 173 Point startPoint = new Point(0, 0);
172 System.Drawing.Point endPoint = new System.Drawing.Point(0, 0); 174 Point endPoint = new Point(0, 0);
173 System.Drawing.Pen drawPen = new Pen(System.Drawing.Color.Black, 7); 175 Pen drawPen = new Pen(Color.Black, 7);
174 Font myFont = new Font("Times New Roman", 14); 176 Font myFont = new Font("Times New Roman", 14);
175 SolidBrush myBrush = new SolidBrush(Color.Black); 177 SolidBrush myBrush = new SolidBrush(Color.Black);
176 char[] lineDelimiter = { ';' }; 178 char[] lineDelimiter = { ';' };
@@ -213,7 +215,7 @@ namespace OpenSim.Region.Environment.Modules
213 GetParams(partsDelimiter, ref nextLine, 5, ref x, ref y); 215 GetParams(partsDelimiter, ref nextLine, 5, ref x, ref y);
214 endPoint.X = (int)x; 216 endPoint.X = (int)x;
215 endPoint.Y = (int)y; 217 endPoint.Y = (int)y;
216 System.Drawing.Image image = ImageHttpRequest(nextLine); 218 Image image = ImageHttpRequest(nextLine);
217 graph.DrawImage(image, (float)startPoint.X, (float)startPoint.Y, x, y); 219 graph.DrawImage(image, (float)startPoint.X, (float)startPoint.Y, x, y);
218 startPoint.X += endPoint.X; 220 startPoint.X += endPoint.X;
219 startPoint.Y += endPoint.Y; 221 startPoint.Y += endPoint.Y;
diff --git a/OpenSim/Region/Environment/Modules/VoiceModule.cs b/OpenSim/Region/Environment/Modules/VoiceModule.cs
index 8ca4698..106becd 100644
--- a/OpenSim/Region/Environment/Modules/VoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/VoiceModule.cs
@@ -27,23 +27,24 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32using Nini.Config; 33using Nini.Config;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
36using OpenSim.Region.Capabilities; 37using OpenSim.Region.Capabilities;
37using Caps = OpenSim.Region.Capabilities.Caps;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Environment.Scenes;
40using Caps=OpenSim.Region.Capabilities.Caps;
40 41
41namespace OpenSim.Region.Environment.Modules 42namespace OpenSim.Region.Environment.Modules
42{ 43{
43 public class VoiceModule : IRegionModule 44 public class VoiceModule : IRegionModule
44 { 45 {
45 private static readonly log4net.ILog m_log = 46 private static readonly ILog m_log =
46 log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 48
48 private Scene m_scene; 49 private Scene m_scene;
49 private IConfig m_config; 50 private IConfig m_config;
diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
index 79e475c..5b18757 100644
--- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
@@ -27,7 +27,6 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using libsecondlife; 30using libsecondlife;
32using Nini.Config; 31using Nini.Config;
33using OpenSim.Framework; 32using OpenSim.Framework;
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index 4f52ad6..e915fb8 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -28,11 +28,14 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net;
32using System.Reflection;
31using System.Threading; 33using System.Threading;
32using libsecondlife; 34using libsecondlife;
35using log4net;
33using Nini.Config; 36using Nini.Config;
34using Nwc.XmlRpc; 37using Nwc.XmlRpc;
35using OpenSim.Framework.Console; 38using OpenSim.Framework;
36using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
37using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Environment.Scenes;
@@ -74,7 +77,7 @@ namespace OpenSim.Region.Environment.Modules
74{ 77{
75 public class XMLRPCModule : IRegionModule, IXMLRPC 78 public class XMLRPCModule : IRegionModule, IXMLRPC
76 { 79 {
77 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 80 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
78 81
79 private object XMLRPCListLock = new object(); 82 private object XMLRPCListLock = new object();
80 private string m_name = "XMLRPCModule"; 83 private string m_name = "XMLRPCModule";
@@ -208,7 +211,7 @@ namespace OpenSim.Region.Environment.Modules
208 } 211 }
209 } 212 }
210 213
211 System.Collections.IEnumerator tmpEnumerator = tmp.GetEnumerator(); 214 IEnumerator tmpEnumerator = tmp.GetEnumerator();
212 while ( tmpEnumerator.MoveNext() ) 215 while ( tmpEnumerator.MoveNext() )
213 m_openChannels.Remove((LLUUID)tmpEnumerator.Current); 216 m_openChannels.Remove((LLUUID)tmpEnumerator.Current);
214 } 217 }
@@ -559,7 +562,7 @@ namespace OpenSim.Region.Environment.Modules
559 private Thread httpThread; 562 private Thread httpThread;
560 public LLUUID m_itemID; 563 public LLUUID m_itemID;
561 public uint m_localID; 564 public uint m_localID;
562 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 565 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
563 566
564 public SendRemoteDataRequest(uint localID, LLUUID itemID, string channel, string dest, int idata, string sdata) 567 public SendRemoteDataRequest(uint localID, LLUUID itemID, string channel, string dest, int idata, string sdata)
565 { 568 {
@@ -583,7 +586,7 @@ namespace OpenSim.Region.Environment.Modules
583 httpThread.IsBackground = true; 586 httpThread.IsBackground = true;
584 finished = false; 587 finished = false;
585 httpThread.Start(); 588 httpThread.Start();
586 OpenSim.Framework.ThreadTracker.Add(httpThread); 589 ThreadTracker.Add(httpThread);
587 590
588 return reqID; 591 return reqID;
589 592
@@ -648,7 +651,7 @@ namespace OpenSim.Region.Environment.Modules
648 } 651 }
649 } 652 }
650 } 653 }
651 catch (System.Net.WebException we) 654 catch (WebException we)
652 { 655 {
653 sdata = we.Message; 656 sdata = we.Message;
654 m_log.Warn("[SendRemoteDataRequest]: Request failed"); 657 m_log.Warn("[SendRemoteDataRequest]: Request failed");
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 29987d8..12ef110 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -26,8 +26,9 @@
26 */ 26 */
27 27
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Region.Environment.Scenes;
30using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Environment.Interfaces;
30using OpenSim.Region.Environment.Scenes;
31
31namespace OpenSim.Region.Environment 32namespace OpenSim.Region.Environment
32{ 33{
33 public class PermissionManager 34 public class PermissionManager
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
index 75d4870..fe9c8e7 100644
--- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
+++ b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
@@ -25,11 +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.Xml; 29using System.Xml;
31using libsecondlife; 30using libsecondlife;
32using OpenSim.Framework.Console;
33 31
34namespace OpenSim.Region.Environment.Scenes 32namespace OpenSim.Region.Environment.Scenes
35{ 33{
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs b/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs
index 750129b..8f29507 100644
--- a/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs
+++ b/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs
@@ -26,11 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Runtime.Serialization;
30using System.Security.Permissions;
29using libsecondlife; 31using libsecondlife;
30using libsecondlife.Packets; 32using libsecondlife.Packets;
31using OpenSim.Framework; 33using OpenSim.Framework;
32using System.Runtime.Serialization;
33using System.Security.Permissions;
34 34
35namespace OpenSim.Region.Environment.Scenes 35namespace OpenSim.Region.Environment.Scenes
36{ 36{
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Scenes
159 159
160 if (info == null) 160 if (info == null)
161 { 161 {
162 throw new System.ArgumentNullException("info"); 162 throw new ArgumentNullException("info");
163 } 163 }
164 164
165 m_scenePresenceID = new LLUUID((Guid)info.GetValue("m_scenePresenceID", typeof(Guid))); 165 m_scenePresenceID = new LLUUID((Guid)info.GetValue("m_scenePresenceID", typeof(Guid)));
@@ -182,7 +182,7 @@ namespace OpenSim.Region.Environment.Scenes
182 { 182 {
183 if (info == null) 183 if (info == null)
184 { 184 {
185 throw new System.ArgumentNullException("info"); 185 throw new ArgumentNullException("info");
186 } 186 }
187 187
188 info.AddValue("m_scenePresenceID", m_scenePresenceID.UUID); 188 info.AddValue("m_scenePresenceID", m_scenePresenceID.UUID);
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 438118f..1faba9a 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.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.Collections.Generic;
29using Axiom.Math;
30using libsecondlife;
31
32using System; 28using System;
33using System.Runtime.Serialization; 29using System.Runtime.Serialization;
34using System.Security.Permissions; 30using System.Security.Permissions;
31using Axiom.Math;
32using libsecondlife;
35 33
36namespace OpenSim.Region.Environment.Scenes 34namespace OpenSim.Region.Environment.Scenes
37{ 35{
@@ -145,7 +143,7 @@ namespace OpenSim.Region.Environment.Scenes
145 143
146 if (info == null) 144 if (info == null)
147 { 145 {
148 throw new System.ArgumentNullException("info"); 146 throw new ArgumentNullException("info");
149 } 147 }
150 148
151 m_uuid = new LLUUID((Guid)info.GetValue("m_uuid", typeof(Guid))); 149 m_uuid = new LLUUID((Guid)info.GetValue("m_uuid", typeof(Guid)));
@@ -188,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
188 { 186 {
189 if (info == null) 187 if (info == null)
190 { 188 {
191 throw new System.ArgumentNullException("info"); 189 throw new ArgumentNullException("info");
192 } 190 }
193 191
194 info.AddValue("m_uuid", m_uuid.UUID); 192 info.AddValue("m_uuid", m_uuid.UUID);
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 8894db0..329f900 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -27,11 +27,12 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using Axiom.Math; 31using Axiom.Math;
31using libsecondlife; 32using libsecondlife;
32using libsecondlife.Packets; 33using libsecondlife.Packets;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35using OpenSim.Region.Environment.Types; 36using OpenSim.Region.Environment.Types;
36using OpenSim.Region.Physics.Manager; 37using OpenSim.Region.Physics.Manager;
37 38
@@ -41,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes
41 42
42 public class InnerScene 43 public class InnerScene
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 #region Events 47 #region Events
47 48
@@ -295,7 +296,7 @@ namespace OpenSim.Region.Environment.Scenes
295 296
296 public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, LLQuaternion rot) 297 public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, LLQuaternion rot)
297 { 298 {
298 System.Console.WriteLine("Attaching object " + objectLocalID + " to " + AttachmentPt); 299 Console.WriteLine("Attaching object " + objectLocalID + " to " + AttachmentPt);
299 SceneObjectPart p = GetSceneObjectPart(objectLocalID); 300 SceneObjectPart p = GetSceneObjectPart(objectLocalID);
300 if (p != null) 301 if (p != null)
301 { 302 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 2db9242..c5a1be1 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -27,23 +27,21 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using Axiom.Math; 30using System.Reflection;
31using System.Text;
31using libsecondlife; 32using libsecondlife;
32using libsecondlife.Packets; 33using libsecondlife.Packets;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Console;
36using System.IO;
37using System.Text;
38using System.Xml;
39using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
40 38
41namespace OpenSim.Region.Environment.Scenes 39namespace OpenSim.Region.Environment.Scenes
42{ 40{
43 public partial class Scene 41 public partial class Scene
44 { 42 {
45 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
46 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 45
48 /// <summary> 46 /// <summary>
49 /// Start all the scripts in the scene which should be started. 47 /// Start all the scripts in the scene which should be started.
@@ -454,7 +452,7 @@ namespace OpenSim.Region.Environment.Scenes
454 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID); 452 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
455 if (item != null) 453 if (item != null)
456 { 454 {
457 if (newName != System.String.Empty) 455 if (newName != String.Empty)
458 { 456 {
459 item.Name = newName; 457 item.Name = newName;
460 } 458 }
@@ -1014,7 +1012,7 @@ namespace OpenSim.Region.Environment.Scenes
1014 public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt, 1012 public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,
1015 uint ItemFlags, uint NextOwnerMask) 1013 uint ItemFlags, uint NextOwnerMask)
1016 { 1014 {
1017 System.Console.WriteLine("RezSingleAttachment: unimplemented yet"); 1015 Console.WriteLine("RezSingleAttachment: unimplemented yet");
1018 } 1016 }
1019 } 1017 }
1020} 1018}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 7e2c9ff..8fdb468 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -29,8 +29,6 @@ using System.Collections.Generic;
29using libsecondlife; 29using libsecondlife;
30using libsecondlife.Packets; 30using libsecondlife.Packets;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.UserManagement;
33using OpenSim.Framework.Console;
34 32
35namespace OpenSim.Region.Environment.Scenes 33namespace OpenSim.Region.Environment.Scenes
36{ 34{
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a3f6948..6d8d481 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -40,11 +40,12 @@ using OpenSim.Framework.Communications;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Region.Environment.Interfaces; 42using OpenSim.Region.Environment.Interfaces;
43using OpenSim.Region.Environment.Modules.Terrain;
43using OpenSim.Region.Environment.Scenes.Scripting; 44using OpenSim.Region.Environment.Scenes.Scripting;
44using OpenSim.Region.Physics.Manager; 45using OpenSim.Region.Physics.Manager;
45using Caps = OpenSim.Region.Capabilities.Caps; 46using Caps=OpenSim.Region.Capabilities.Caps;
46using Image = System.Drawing.Image; 47using Image=System.Drawing.Image;
47using Timer = System.Timers.Timer; 48using Timer=System.Timers.Timer;
48 49
49namespace OpenSim.Region.Environment.Scenes 50namespace OpenSim.Region.Environment.Scenes
50{ 51{
@@ -580,7 +581,7 @@ namespace OpenSim.Region.Environment.Scenes
580 if (!avatar.IsChildAgent) 581 if (!avatar.IsChildAgent)
581 avatar.ControllingClient.Kick("The simulator is going down."); 582 avatar.ControllingClient.Kick("The simulator is going down.");
582 583
583 avatar.ControllingClient.OutPacket(PacketPool.Instance.GetPacket(libsecondlife.Packets.PacketType.DisableSimulator), 584 avatar.ControllingClient.OutPacket(PacketPool.Instance.GetPacket(PacketType.DisableSimulator),
584 ThrottleOutPacketType.Task); 585 ThrottleOutPacketType.Task);
585 }); 586 });
586 587
@@ -755,17 +756,17 @@ namespace OpenSim.Region.Environment.Scenes
755 { 756 {
756 throw; 757 throw;
757 } 758 }
758 catch (System.AccessViolationException e) 759 catch (AccessViolationException e)
759 { 760 {
760 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); 761 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
761 762
762 } 763 }
763 catch (System.NullReferenceException e) 764 catch (NullReferenceException e)
764 { 765 {
765 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); 766 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
766 767
767 } 768 }
768 catch (System.InvalidOperationException e) 769 catch (InvalidOperationException e)
769 { 770 {
770 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); 771 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
771 772
@@ -941,13 +942,13 @@ namespace OpenSim.Region.Environment.Scenes
941 if (map == null) 942 if (map == null)
942 { 943 {
943 m_log.Info("[TERRAIN]: No default terrain. Generating a new terrain."); 944 m_log.Info("[TERRAIN]: No default terrain. Generating a new terrain.");
944 Heightmap = new Modules.Terrain.TerrainChannel(); 945 Heightmap = new TerrainChannel();
945 946
946 m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID); 947 m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID);
947 } 948 }
948 else 949 else
949 { 950 {
950 Heightmap = new Modules.Terrain.TerrainChannel(map); 951 Heightmap = new TerrainChannel(map);
951 } 952 }
952 953
953 } 954 }
@@ -1094,7 +1095,7 @@ namespace OpenSim.Region.Environment.Scenes
1094 byte[] data; 1095 byte[] data;
1095 try 1096 try
1096 { 1097 {
1097 data = OpenJPEGNet.OpenJPEG.EncodeFromImage(mapbmp, false); 1098 data = OpenJPEG.EncodeFromImage(mapbmp, false);
1098 } 1099 }
1099 catch (Exception) 1100 catch (Exception)
1100 { 1101 {
@@ -1420,7 +1421,7 @@ namespace OpenSim.Region.Environment.Scenes
1420 { 1421 {
1421 DeleteSceneObjectGroup(grp); 1422 DeleteSceneObjectGroup(grp);
1422 } 1423 }
1423 catch (System.Exception) 1424 catch (Exception)
1424 { 1425 {
1425 m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border."); 1426 m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border.");
1426 } 1427 }
@@ -1714,7 +1715,7 @@ namespace OpenSim.Region.Environment.Scenes
1714 { 1715 {
1715 client.SendKillObject(avatar.RegionHandle, avatar.LocalId); 1716 client.SendKillObject(avatar.RegionHandle, avatar.LocalId);
1716 } 1717 }
1717 catch (System.NullReferenceException) 1718 catch (NullReferenceException)
1718 { 1719 {
1719 //We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway. 1720 //We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway.
1720 } 1721 }
@@ -2041,7 +2042,7 @@ namespace OpenSim.Region.Environment.Scenes
2041 m_innerScene.removeUserCount(true); 2042 m_innerScene.removeUserCount(true);
2042 } 2043 }
2043 // Tell a single agent to disconnect from the region. 2044 // Tell a single agent to disconnect from the region.
2044 libsecondlife.Packets.DisableSimulatorPacket disable = (libsecondlife.Packets.DisableSimulatorPacket)PacketPool.Instance.GetPacket(libsecondlife.Packets.PacketType.DisableSimulator); 2045 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
2045 presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Unknown); 2046 presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Unknown);
2046 presence.ControllingClient.Close(true); 2047 presence.ControllingClient.Close(true);
2047 } 2048 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 5551173..d9dc1da 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -27,18 +27,18 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using OpenSim.Framework; 33using OpenSim.Framework;
32using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Terrain;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
36 36
37namespace OpenSim.Region.Environment.Scenes 37namespace OpenSim.Region.Environment.Scenes
38{ 38{
39 public abstract class SceneBase : IScene 39 public abstract class SceneBase : IScene
40 { 40 {
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 #region Events 43 #region Events
44 44
@@ -204,7 +204,7 @@ namespace OpenSim.Region.Environment.Scenes
204 /// <summary> 204 /// <summary>
205 /// XXX These two methods are very temporary 205 /// XXX These two methods are very temporary
206 /// </summary> 206 /// </summary>
207 protected Dictionary<LLUUID, String> capsPaths = new Dictionary<LLUUID, String>(); 207 protected Dictionary<LLUUID, string> capsPaths = new Dictionary<LLUUID, string>();
208 public string GetCapsPath(LLUUID agentId) 208 public string GetCapsPath(LLUUID agentId)
209 { 209 {
210 if (capsPaths.ContainsKey(agentId)) 210 if (capsPaths.ContainsKey(agentId))
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index db2327e..0062e4d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
33using log4net;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Region.Environment.Scenes 37namespace OpenSim.Region.Environment.Scenes
37{ 38{
@@ -41,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes
41 42
42 public class SceneCommunicationService //one instance per region 43 public class SceneCommunicationService //one instance per region
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 protected CommunicationsManager m_commsProvider; 47 protected CommunicationsManager m_commsProvider;
47 protected RegionInfo m_regionInfo; 48 protected RegionInfo m_regionInfo;
@@ -416,7 +417,7 @@ namespace OpenSim.Region.Environment.Scenes
416 } 417 }
417 } 418 }
418 } 419 }
419 catch (System.InvalidOperationException) 420 catch (InvalidOperationException)
420 { 421 {
421 // We're ignoring a collection was modified error because this data gets old and outdated fast. 422 // We're ignoring a collection was modified error because this data gets old and outdated fast.
422 } 423 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 5cf8ece..c9c0ad6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.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 libsecondlife;
29using System; 28using System;
29using libsecondlife;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Environment.Interfaces;
32using Caps = OpenSim.Region.Capabilities.Caps; 32using Caps=OpenSim.Region.Capabilities.Caps;
33 33
34namespace OpenSim.Region.Environment.Scenes 34namespace OpenSim.Region.Environment.Scenes
35{ 35{
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Environment.Scenes
155 public delegate void DeregisterCapsEvent(LLUUID agentID, Caps caps); 155 public delegate void DeregisterCapsEvent(LLUUID agentID, Caps caps);
156 public event DeregisterCapsEvent OnDeregisterCaps; 156 public event DeregisterCapsEvent OnDeregisterCaps;
157 157
158 public class MoneyTransferArgs : System.EventArgs 158 public class MoneyTransferArgs : EventArgs
159 { 159 {
160 public LLUUID sender; 160 public LLUUID sender;
161 public LLUUID receiver; 161 public LLUUID receiver;
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes
176 } 176 }
177 } 177 }
178 178
179 public class LandBuyArgs : System.EventArgs 179 public class LandBuyArgs : EventArgs
180 { 180 {
181 public LLUUID agentId = LLUUID.Zero; 181 public LLUUID agentId = LLUUID.Zero;
182 182
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 102be30..61a4eae 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -28,10 +28,10 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Net.Sockets; 31using System.Reflection;
32using libsecondlife; 32using libsecondlife;
33using log4net;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 35
36namespace OpenSim.Region.Environment.Scenes 36namespace OpenSim.Region.Environment.Scenes
37{ 37{
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
39 39
40 public class SceneManager 40 public class SceneManager
41 { 41 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 public event RestartSim OnRestartSim; 44 public event RestartSim OnRestartSim;
45 45
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 495b604..d9808e6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -25,19 +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.Reflection;
29
30using libsecondlife; 29using libsecondlife;
31 30using log4net;
32using OpenSim.Framework; 31using OpenSim.Framework;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
35 33
36namespace OpenSim.Region.Environment.Scenes 34namespace OpenSim.Region.Environment.Scenes
37{ 35{
38 public partial class SceneObjectGroup : EntityBase 36 public partial class SceneObjectGroup : EntityBase
39 { 37 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 39
42 /// <summary> 40 /// <summary>
43 /// Start a given script. 41 /// Start a given script.
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 7abaaee..8651d7e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -29,13 +29,11 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.IO; 31using System.IO;
32using System.Text;
33using System.Xml; 32using System.Xml;
34using Axiom.Math; 33using Axiom.Math;
35using libsecondlife; 34using libsecondlife;
36using libsecondlife.Packets; 35using libsecondlife.Packets;
37using OpenSim.Framework; 36using OpenSim.Framework;
38using OpenSim.Framework.Console;
39using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
40using OpenSim.Region.Physics.Manager; 38using OpenSim.Region.Physics.Manager;
41 39
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 8ce71c4..72f78f3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -27,13 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Xml.Serialization; 30using System.Reflection;
31
32using libsecondlife; 31using libsecondlife;
33 32using log4net;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Console;
37using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes.Scripting; 36using OpenSim.Region.Environment.Scenes.Scripting;
39 37
@@ -41,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
41{ 39{
42 public partial class SceneObjectPart : IScriptHost 40 public partial class SceneObjectPart : IScriptHost
43 { 41 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 43
46 private string m_inventoryFileName = String.Empty; 44 private string m_inventoryFileName = String.Empty;
47 45
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 61d10c9..40a9fcf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -28,18 +28,16 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.Runtime.Serialization;
32using System.Security.Permissions;
31using System.Xml; 33using System.Xml;
32using System.Xml.Serialization; 34using System.Xml.Serialization;
33using Axiom.Math; 35using Axiom.Math;
34using libsecondlife; 36using libsecondlife;
35using libsecondlife.Packets; 37using libsecondlife.Packets;
36using OpenSim.Framework; 38using OpenSim.Framework;
37using OpenSim.Framework.Console;
38using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Environment.Scenes.Scripting; 39using OpenSim.Region.Environment.Scenes.Scripting;
40using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.Physics.Manager;
41using System.Runtime.Serialization;
42using System.Security.Permissions;
43 41
44namespace OpenSim.Region.Environment.Scenes 42namespace OpenSim.Region.Environment.Scenes
45{ 43{
@@ -324,7 +322,7 @@ namespace OpenSim.Region.Environment.Scenes
324 ParentGroup.ResetChildPrimPhysicsPositions(); 322 ParentGroup.ResetChildPrimPhysicsPositions();
325 323
326 } 324 }
327 catch (System.NullReferenceException) 325 catch (NullReferenceException)
328 { 326 {
329 // Ignore, and skip over. 327 // Ignore, and skip over.
330 } 328 }
@@ -2326,7 +2324,7 @@ namespace OpenSim.Region.Environment.Scenes
2326 2324
2327 if (info == null) 2325 if (info == null)
2328 { 2326 {
2329 throw new System.ArgumentNullException("info"); 2327 throw new ArgumentNullException("info");
2330 } 2328 }
2331 2329
2332 /* 2330 /*
@@ -2344,7 +2342,7 @@ namespace OpenSim.Region.Environment.Scenes
2344 { 2342 {
2345 if (info == null) 2343 if (info == null)
2346 { 2344 {
2347 throw new System.ArgumentNullException("info"); 2345 throw new ArgumentNullException("info");
2348 } 2346 }
2349 2347
2350 info.AddValue("m_inventoryFileName", m_inventoryFileName); 2348 info.AddValue("m_inventoryFileName", m_inventoryFileName);
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8b8373d..d85eea6 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -27,16 +27,16 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
31using System.Runtime.Serialization;
32using System.Security.Permissions;
30using Axiom.Math; 33using Axiom.Math;
31using libsecondlife; 34using libsecondlife;
32using libsecondlife.Packets; 35using libsecondlife.Packets;
36using log4net;
33using OpenSim.Framework; 37using OpenSim.Framework;
34using OpenSim.Framework.Console;
35using OpenSim.Region.Environment.Types; 38using OpenSim.Region.Environment.Types;
36using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
37using OpenSim.Region.Environment.Interfaces;
38using System.Runtime.Serialization;
39using System.Security.Permissions;
40 40
41namespace OpenSim.Region.Environment.Scenes 41namespace OpenSim.Region.Environment.Scenes
42{ 42{
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Environment.Scenes
48// System.Console.WriteLine("[ScenePresence] Destructor called"); 48// System.Console.WriteLine("[ScenePresence] Destructor called");
49// } 49// }
50 50
51 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 52
53 public static AvatarAnimations Animations = new AvatarAnimations(); 53 public static AvatarAnimations Animations = new AvatarAnimations();
54 public static byte[] DefaultTexture; 54 public static byte[] DefaultTexture;
@@ -1746,7 +1746,7 @@ namespace OpenSim.Region.Environment.Scenes
1746 movementvector.Z = force.Z; 1746 movementvector.Z = force.Z;
1747 Velocity = movementvector; 1747 Velocity = movementvector;
1748 } 1748 }
1749 catch (System.NullReferenceException) 1749 catch (NullReferenceException)
1750 { 1750 {
1751 // Under extreme load, this returns a NullReference Exception that we can ignore. 1751 // Under extreme load, this returns a NullReference Exception that we can ignore.
1752 // Ignoring this causes no movement to be sent to the physics engine... 1752 // Ignoring this causes no movement to be sent to the physics engine...
@@ -1800,7 +1800,7 @@ namespace OpenSim.Region.Environment.Scenes
1800 1800
1801 if (info == null) 1801 if (info == null)
1802 { 1802 {
1803 throw new System.ArgumentNullException("info"); 1803 throw new ArgumentNullException("info");
1804 } 1804 }
1805 1805
1806 FullID = new LLUUID((Guid)info.GetValue("FullID", typeof(Guid))); 1806 FullID = new LLUUID((Guid)info.GetValue("FullID", typeof(Guid)));
@@ -1817,7 +1817,7 @@ namespace OpenSim.Region.Environment.Scenes
1817 { 1817 {
1818 if (info == null) 1818 if (info == null)
1819 { 1819 {
1820 throw new System.ArgumentNullException("info"); 1820 throw new ArgumentNullException("info");
1821 } 1821 }
1822 1822
1823 info.AddValue("FullID", FullID.UUID); 1823 info.AddValue("FullID", FullID.UUID);
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.Environment.Scenes
1928 1928
1929 if (info == null) 1929 if (info == null)
1930 { 1930 {
1931 throw new System.ArgumentNullException("info"); 1931 throw new ArgumentNullException("info");
1932 } 1932 }
1933/* JB 1933/* JB
1934 if (Animations == null) 1934 if (Animations == null)
@@ -2100,7 +2100,7 @@ namespace OpenSim.Region.Environment.Scenes
2100 { 2100 {
2101 if (info == null) 2101 if (info == null)
2102 { 2102 {
2103 throw new System.ArgumentNullException("info"); 2103 throw new ArgumentNullException("info");
2104 } 2104 }
2105 2105
2106 base.GetObjectData(info, context); 2106 base.GetObjectData(info, context);
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
index 18b3f46..b1ee519 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.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 OpenSim.Framework.Console;
29
30//TODO: WHERE TO PLACE THIS? 28//TODO: WHERE TO PLACE THIS?
31 29
32namespace OpenSim.Region.Environment.Scenes.Scripting 30namespace OpenSim.Region.Environment.Scenes.Scripting
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
index 7dee2e4..6216e2c 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -29,13 +29,13 @@
29using System; 29using System;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using OpenSim.Framework.Console; 32using log4net;
33 33
34namespace OpenSim.Region.Environment.Scenes.Scripting 34namespace OpenSim.Region.Environment.Scenes.Scripting
35{ 35{
36 public class ScriptEngineLoader 36 public class ScriptEngineLoader
37 { 37 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 39
40 public ScriptEngineInterface LoadScriptEngine(string EngineName) 40 public ScriptEngineInterface LoadScriptEngine(string EngineName)
41 { 41 {
diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Environment/StorageManager.cs
index 4cbadba..b9a42a2 100644
--- a/OpenSim/Region/Environment/StorageManager.cs
+++ b/OpenSim/Region/Environment/StorageManager.cs
@@ -27,14 +27,14 @@
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using OpenSim.Framework.Console; 30using log4net;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Environment.Interfaces;
32 32
33namespace OpenSim.Region.Environment 33namespace OpenSim.Region.Environment
34{ 34{
35 public class StorageManager 35 public class StorageManager
36 { 36 {
37 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 37 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 38
39 private IRegionDataStore m_dataStore; 39 private IRegionDataStore m_dataStore;
40 40
diff --git a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
index f1f2302..24ce94b 100644
--- a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
+++ b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.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 System;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
30 31
@@ -261,7 +262,7 @@ namespace OpenSim.Region.Environment.Types
261 public string[] GetNeighbours(string nodeName) 262 public string[] GetNeighbours(string nodeName)
262 { 263 {
263 string[] retVal = new string[1]; 264 string[] retVal = new string[1];
264 retVal[0] = System.String.Empty; 265 retVal[0] = String.Empty;
265 return retVal; 266 return retVal;
266 } 267 }
267 } 268 }
diff --git a/OpenSim/Region/Environment/Types/UpdateQueue.cs b/OpenSim/Region/Environment/Types/UpdateQueue.cs
index 4d273ce..ec1ffd2 100644
--- a/OpenSim/Region/Environment/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Environment/Types/UpdateQueue.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.Collections.Generic; 29using System.Collections.Generic;
29using libsecondlife;
30using OpenSim.Region.Environment.Scenes;
31
32using System;
33using System.Runtime.Serialization; 30using System.Runtime.Serialization;
34using System.Security.Permissions; 31using System.Security.Permissions;
32using libsecondlife;
33using OpenSim.Region.Environment.Scenes;
35 34
36namespace OpenSim.Region.Environment.Types 35namespace OpenSim.Region.Environment.Types
37{ 36{
@@ -97,7 +96,7 @@ namespace OpenSim.Region.Environment.Types
97 96
98 if (info == null) 97 if (info == null)
99 { 98 {
100 throw new System.ArgumentNullException("info"); 99 throw new ArgumentNullException("info");
101 } 100 }
102 101
103 m_queue = (Queue<SceneObjectPart>)info.GetValue("m_queue", typeof(Queue<SceneObjectPart>)); 102 m_queue = (Queue<SceneObjectPart>)info.GetValue("m_queue", typeof(Queue<SceneObjectPart>));
@@ -118,7 +117,7 @@ namespace OpenSim.Region.Environment.Types
118 { 117 {
119 if (info == null) 118 if (info == null)
120 { 119 {
121 throw new System.ArgumentNullException("info"); 120 throw new ArgumentNullException("info");
122 } 121 }
123 122
124 List<Guid> ids_work = new List<Guid>(); 123 List<Guid> ids_work = new List<Guid>();
diff --git a/OpenSim/Region/Examples/SimpleModule/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleModule/Properties/AssemblyInfo.cs
index aeb79e0..e0e8fd9 100644
--- a/OpenSim/Region/Examples/SimpleModule/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Examples/SimpleModule/Properties/AssemblyInfo.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31 30
32// General Information about an assembly is controlled through the following 31// General Information about an assembly is controlled through the following
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
index 218908c..6e9fe6d 100644
--- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
+++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.IO; 29using System.IO;
31using System.Text;
32using libsecondlife; 30using libsecondlife;
33using Nini.Config; 31using Nini.Config;
34using OpenSim.Framework; 32using OpenSim.Framework;
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
index deb289f..43049fc 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
@@ -28,14 +28,15 @@
28using System; 28using System;
29using System.CodeDom.Compiler; 29using System.CodeDom.Compiler;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using log4net;
31using Microsoft.CSharp; 33using Microsoft.CSharp;
32using OpenSim.Framework.Console;
33 34
34namespace OpenSim.Region.ExtensionsScriptModule.CSharp 35namespace OpenSim.Region.ExtensionsScriptModule.CSharp
35{ 36{
36 public class CSharpScriptEngine : IScriptCompiler 37 public class CSharpScriptEngine : IScriptCompiler
37 { 38 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 40
40 public string FileExt() 41 public string FileExt()
41 { 42 {
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
index f5689cb..52afe3f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
@@ -28,14 +28,15 @@
28using System; 28using System;
29using System.CodeDom.Compiler; 29using System.CodeDom.Compiler;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using log4net;
31using Microsoft.JScript; 33using Microsoft.JScript;
32using OpenSim.Framework.Console;
33 34
34namespace OpenSim.Region.ExtensionsScriptModule.JScript 35namespace OpenSim.Region.ExtensionsScriptModule.JScript
35{ 36{
36 public class JScriptEngine : IScriptCompiler 37 public class JScriptEngine : IScriptCompiler
37 { 38 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 40
40 public string FileExt() 41 public string FileExt()
41 { 42 {
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
index 16c6e79..efd01e9 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
@@ -25,6 +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;
29
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 30namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
29{ 31{
30 partial class Thread 32 partial class Thread
@@ -46,8 +48,8 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
46 string typ = 48 string typ =
47 ((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]). 49 ((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]).
48 mNameType.Type.Value; 50 mNameType.Type.Value;
49 string typeparam = System.String.Empty; 51 string typeparam = String.Empty;
50 string typereturn = System.String.Empty; 52 string typereturn = String.Empty;
51 int firstbrak = 0; 53 int firstbrak = 0;
52 int secondbrak = 0; 54 int secondbrak = 0;
53 firstbrak = typ.LastIndexOf('('); 55 firstbrak = typ.LastIndexOf('(');
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
index 428192f..16c449f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
@@ -25,8 +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.Reflection;
28using libsecondlife; 29using libsecondlife;
29using OpenSim.Framework.Console; 30using log4net;
30using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
31 32
32namespace OpenSim.Region.ExtensionsScriptModule 33namespace OpenSim.Region.ExtensionsScriptModule
@@ -36,7 +37,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
36 /// </summary> 37 /// </summary>
37 public class ScriptInfo 38 public class ScriptInfo
38 { 39 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 41
41 // Reference to world.eventsManager provided for convenience 42 // Reference to world.eventsManager provided for convenience
42 public EventManager events; 43 public EventManager events;
@@ -47,7 +48,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
47 // API Access 48 // API Access
48 public ScriptAPI api; 49 public ScriptAPI api;
49 50
50 public log4net.ILog Log 51 public ILog Log
51 { 52 {
52 get { return m_log; } 53 get { return m_log; }
53 } 54 }
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
index d0a0e86..a11fb0f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
@@ -26,9 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Reflection;
29using System.Text; 30using System.Text;
30using Axiom.Math; 31using Axiom.Math;
31using OpenSim.Framework.Console; 32using log4net;
32using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Environment.Interfaces;
33using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Environment.Scenes;
34using Key = libsecondlife.LLUUID; 35using Key = libsecondlife.LLUUID;
@@ -44,7 +45,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
44 /// <remarks>Avoid at all costs. This should ONLY be used for LSL.</remarks> 45 /// <remarks>Avoid at all costs. This should ONLY be used for LSL.</remarks>
45 internal class ScriptInterpretedAPI 46 internal class ScriptInterpretedAPI
46 { 47 {
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 49
49 protected Key m_object; 50 protected Key m_object;
50 protected Scene m_scene; 51 protected Scene m_scene;
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
index 9edc6dc..8c11f7a 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
@@ -26,8 +26,9 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
30using log4net;
29using Nini.Config; 31using Nini.Config;
30using OpenSim.Framework.Console;
31using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
32using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
33using OpenSim.Region.ExtensionsScriptModule.CSharp; 34using OpenSim.Region.ExtensionsScriptModule.CSharp;
@@ -38,7 +39,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
38{ 39{
39 public class ScriptManager : IRegionModule, IExtensionScriptModule 40 public class ScriptManager : IRegionModule, IExtensionScriptModule
40 { 41 {
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 43
43 private readonly List<IScript> scripts = new List<IScript>(); 44 private readonly List<IScript> scripts = new List<IScript>();
44 private Scene m_scene; 45 private Scene m_scene;
diff --git a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
index d6ef1fb..2d9f32f 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
@@ -26,11 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using libsecondlife;
30using System.Text;
31using OpenSim.Region.Environment.Scenes;
32using OpenSim.Framework;
33using OpenSim.Data.Base; 30using OpenSim.Data.Base;
31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes;
34 33
35namespace OpenSim.Region.Modules.AvatarFactory 34namespace OpenSim.Region.Modules.AvatarFactory
36{ 35{
@@ -52,7 +51,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
52 51
53 m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("UUID", 52 m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("UUID",
54 delegate(AppearanceRowMapper mapper) { return mapper.Object.ScenePresenceID.UUID; }, 53 delegate(AppearanceRowMapper mapper) { return mapper.Object.ScenePresenceID.UUID; },
55 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.ScenePresenceID = new libsecondlife.LLUUID(value.ToString()); }); 54 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.ScenePresenceID = new LLUUID(value.ToString()); });
56 55
57 rowMapperSchema.AddMapping<uint>("Serial", 56 rowMapperSchema.AddMapping<uint>("Serial",
58 delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.WearablesSerial; }, 57 delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.WearablesSerial; },
@@ -64,127 +63,127 @@ namespace OpenSim.Region.Modules.AvatarFactory
64 { 63 {
65 if (mapper.Object.Wearables == null) 64 if (mapper.Object.Wearables == null)
66 { 65 {
67 mapper.Object.Wearables = new OpenSim.Framework.AvatarWearable[13]; 66 mapper.Object.Wearables = new AvatarWearable[13];
68 for (int i = 0; i < 13; i++) 67 for (int i = 0; i < 13; i++)
69 { 68 {
70 mapper.Object.Wearables[i] = new AvatarWearable(); 69 mapper.Object.Wearables[i] = new AvatarWearable();
71 } 70 }
72 } 71 }
73 mapper.Object.Wearables[0].ItemID = new libsecondlife.LLUUID(value.ToString()); 72 mapper.Object.Wearables[0].ItemID = new LLUUID(value.ToString());
74 }); 73 });
75 74
76 rowMapperSchema.AddMapping<Guid>("WearableAsset0", 75 rowMapperSchema.AddMapping<Guid>("WearableAsset0",
77 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].AssetID.UUID; }, 76 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].AssetID.UUID; },
78 delegate(AppearanceRowMapper mapper, Guid value) 77 delegate(AppearanceRowMapper mapper, Guid value)
79 { mapper.Object.Wearables[0].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 78 { mapper.Object.Wearables[0].AssetID = new LLUUID(value.ToString()); });
80 79
81 rowMapperSchema.AddMapping<Guid>("WearableItem1", 80 rowMapperSchema.AddMapping<Guid>("WearableItem1",
82 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].ItemID.UUID; }, 81 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].ItemID.UUID; },
83 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[1].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 82 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[1].ItemID = new LLUUID(value.ToString()); });
84 83
85 rowMapperSchema.AddMapping<Guid>("WearableAsset1", 84 rowMapperSchema.AddMapping<Guid>("WearableAsset1",
86 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].AssetID.UUID; }, 85 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].AssetID.UUID; },
87 delegate(AppearanceRowMapper mapper, Guid value) 86 delegate(AppearanceRowMapper mapper, Guid value)
88 { mapper.Object.Wearables[1].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 87 { mapper.Object.Wearables[1].AssetID = new LLUUID(value.ToString()); });
89 88
90 rowMapperSchema.AddMapping<Guid>("WearableItem2", 89 rowMapperSchema.AddMapping<Guid>("WearableItem2",
91 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].ItemID.UUID; }, 90 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].ItemID.UUID; },
92 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[2].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 91 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[2].ItemID = new LLUUID(value.ToString()); });
93 92
94 rowMapperSchema.AddMapping<Guid>("WearableAsset2", 93 rowMapperSchema.AddMapping<Guid>("WearableAsset2",
95 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].AssetID.UUID; }, 94 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].AssetID.UUID; },
96 delegate(AppearanceRowMapper mapper, Guid value) 95 delegate(AppearanceRowMapper mapper, Guid value)
97 { mapper.Object.Wearables[2].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 96 { mapper.Object.Wearables[2].AssetID = new LLUUID(value.ToString()); });
98 97
99 rowMapperSchema.AddMapping<Guid>("WearableItem3", 98 rowMapperSchema.AddMapping<Guid>("WearableItem3",
100 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].ItemID.UUID; }, 99 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].ItemID.UUID; },
101 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[3].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 100 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[3].ItemID = new LLUUID(value.ToString()); });
102 101
103 rowMapperSchema.AddMapping<Guid>("WearableAsset3", 102 rowMapperSchema.AddMapping<Guid>("WearableAsset3",
104 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].AssetID.UUID; }, 103 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].AssetID.UUID; },
105 delegate(AppearanceRowMapper mapper, Guid value) 104 delegate(AppearanceRowMapper mapper, Guid value)
106 { mapper.Object.Wearables[3].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 105 { mapper.Object.Wearables[3].AssetID = new LLUUID(value.ToString()); });
107 106
108 rowMapperSchema.AddMapping<Guid>("WearableItem4", 107 rowMapperSchema.AddMapping<Guid>("WearableItem4",
109 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].ItemID.UUID; }, 108 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].ItemID.UUID; },
110 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[4].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 109 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[4].ItemID = new LLUUID(value.ToString()); });
111 110
112 rowMapperSchema.AddMapping<Guid>("WearableAsset4", 111 rowMapperSchema.AddMapping<Guid>("WearableAsset4",
113 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].AssetID.UUID; }, 112 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].AssetID.UUID; },
114 delegate(AppearanceRowMapper mapper, Guid value) 113 delegate(AppearanceRowMapper mapper, Guid value)
115 { mapper.Object.Wearables[4].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 114 { mapper.Object.Wearables[4].AssetID = new LLUUID(value.ToString()); });
116 115
117 rowMapperSchema.AddMapping<Guid>("WearableItem5", 116 rowMapperSchema.AddMapping<Guid>("WearableItem5",
118 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].ItemID.UUID; }, 117 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].ItemID.UUID; },
119 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[5].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 118 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[5].ItemID = new LLUUID(value.ToString()); });
120 119
121 rowMapperSchema.AddMapping<Guid>("WearableAsset5", 120 rowMapperSchema.AddMapping<Guid>("WearableAsset5",
122 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].AssetID.UUID; }, 121 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].AssetID.UUID; },
123 delegate(AppearanceRowMapper mapper, Guid value) 122 delegate(AppearanceRowMapper mapper, Guid value)
124 { mapper.Object.Wearables[5].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 123 { mapper.Object.Wearables[5].AssetID = new LLUUID(value.ToString()); });
125 124
126 rowMapperSchema.AddMapping<Guid>("WearableItem6", 125 rowMapperSchema.AddMapping<Guid>("WearableItem6",
127 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].ItemID.UUID; }, 126 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].ItemID.UUID; },
128 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[6].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 127 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[6].ItemID = new LLUUID(value.ToString()); });
129 128
130 rowMapperSchema.AddMapping<Guid>("WearableAsset6", 129 rowMapperSchema.AddMapping<Guid>("WearableAsset6",
131 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].AssetID.UUID; }, 130 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].AssetID.UUID; },
132 delegate(AppearanceRowMapper mapper, Guid value) 131 delegate(AppearanceRowMapper mapper, Guid value)
133 { mapper.Object.Wearables[6].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 132 { mapper.Object.Wearables[6].AssetID = new LLUUID(value.ToString()); });
134 133
135 rowMapperSchema.AddMapping<Guid>("WearableItem7", 134 rowMapperSchema.AddMapping<Guid>("WearableItem7",
136 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].ItemID.UUID; }, 135 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].ItemID.UUID; },
137 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[7].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 136 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[7].ItemID = new LLUUID(value.ToString()); });
138 137
139 rowMapperSchema.AddMapping<Guid>("WearableAsset7", 138 rowMapperSchema.AddMapping<Guid>("WearableAsset7",
140 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].AssetID.UUID; }, 139 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].AssetID.UUID; },
141 delegate(AppearanceRowMapper mapper, Guid value) 140 delegate(AppearanceRowMapper mapper, Guid value)
142 { mapper.Object.Wearables[7].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 141 { mapper.Object.Wearables[7].AssetID = new LLUUID(value.ToString()); });
143 142
144 rowMapperSchema.AddMapping<Guid>("WearableItem8", 143 rowMapperSchema.AddMapping<Guid>("WearableItem8",
145 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].ItemID.UUID; }, 144 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].ItemID.UUID; },
146 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[8].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 145 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[8].ItemID = new LLUUID(value.ToString()); });
147 146
148 rowMapperSchema.AddMapping<Guid>("WearableAsset8", 147 rowMapperSchema.AddMapping<Guid>("WearableAsset8",
149 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].AssetID.UUID; }, 148 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].AssetID.UUID; },
150 delegate(AppearanceRowMapper mapper, Guid value) 149 delegate(AppearanceRowMapper mapper, Guid value)
151 { mapper.Object.Wearables[8].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 150 { mapper.Object.Wearables[8].AssetID = new LLUUID(value.ToString()); });
152 151
153 rowMapperSchema.AddMapping<Guid>("WearableItem9", 152 rowMapperSchema.AddMapping<Guid>("WearableItem9",
154 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].ItemID.UUID; }, 153 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].ItemID.UUID; },
155 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[9].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 154 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[9].ItemID = new LLUUID(value.ToString()); });
156 155
157 rowMapperSchema.AddMapping<Guid>("WearableAsset9", 156 rowMapperSchema.AddMapping<Guid>("WearableAsset9",
158 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].AssetID.UUID; }, 157 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].AssetID.UUID; },
159 delegate(AppearanceRowMapper mapper, Guid value) 158 delegate(AppearanceRowMapper mapper, Guid value)
160 { mapper.Object.Wearables[9].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 159 { mapper.Object.Wearables[9].AssetID = new LLUUID(value.ToString()); });
161 160
162 rowMapperSchema.AddMapping<Guid>("WearableItem10", 161 rowMapperSchema.AddMapping<Guid>("WearableItem10",
163 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].ItemID.UUID; }, 162 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].ItemID.UUID; },
164 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[10].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 163 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[10].ItemID = new LLUUID(value.ToString()); });
165 164
166 rowMapperSchema.AddMapping<Guid>("WearableAsset10", 165 rowMapperSchema.AddMapping<Guid>("WearableAsset10",
167 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].AssetID.UUID; }, 166 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].AssetID.UUID; },
168 delegate(AppearanceRowMapper mapper, Guid value) 167 delegate(AppearanceRowMapper mapper, Guid value)
169 { mapper.Object.Wearables[10].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 168 { mapper.Object.Wearables[10].AssetID = new LLUUID(value.ToString()); });
170 169
171 rowMapperSchema.AddMapping<Guid>("WearableItem11", 170 rowMapperSchema.AddMapping<Guid>("WearableItem11",
172 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].ItemID.UUID; }, 171 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].ItemID.UUID; },
173 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[11].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 172 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[11].ItemID = new LLUUID(value.ToString()); });
174 173
175 rowMapperSchema.AddMapping<Guid>("WearableAsset11", 174 rowMapperSchema.AddMapping<Guid>("WearableAsset11",
176 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].AssetID.UUID; }, 175 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].AssetID.UUID; },
177 delegate(AppearanceRowMapper mapper, Guid value) 176 delegate(AppearanceRowMapper mapper, Guid value)
178 { mapper.Object.Wearables[11].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 177 { mapper.Object.Wearables[11].AssetID = new LLUUID(value.ToString()); });
179 178
180 rowMapperSchema.AddMapping<Guid>("WearableItem12", 179 rowMapperSchema.AddMapping<Guid>("WearableItem12",
181 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].ItemID.UUID; }, 180 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].ItemID.UUID; },
182 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[12].ItemID = new libsecondlife.LLUUID(value.ToString()); }); 181 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[12].ItemID = new LLUUID(value.ToString()); });
183 182
184 rowMapperSchema.AddMapping<Guid>("WearableAsset12", 183 rowMapperSchema.AddMapping<Guid>("WearableAsset12",
185 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].AssetID.UUID; }, 184 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].AssetID.UUID; },
186 delegate(AppearanceRowMapper mapper, Guid value) 185 delegate(AppearanceRowMapper mapper, Guid value)
187 { mapper.Object.Wearables[12].AssetID = new libsecondlife.LLUUID(value.ToString()); }); 186 { mapper.Object.Wearables[12].AssetID = new LLUUID(value.ToString()); });
188 187
189 } 188 }
190 189
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index ae522ef..0ee8848 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -30,12 +30,12 @@ using System.Collections.Generic;
30using System.Threading; 30using System.Threading;
31using libsecondlife; 31using libsecondlife;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Data.Base;
34using OpenSim.Data.MapperFactory;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
36using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
37using OpenSim.Data.Base;
38using OpenSim.Data.MapperFactory;
39 39
40namespace OpenSim.Region.Modules.AvatarFactory 40namespace OpenSim.Region.Modules.AvatarFactory
41{ 41{
diff --git a/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs
index ec9714a..a9fe53e 100644
--- a/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31 30
32// General Information about an assembly is controlled through the following 31// General Information about an assembly is controlled through the following
diff --git a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs
index e50a89e..c9f8423 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31 30
32// General Information about an assembly is controlled through the following 31// General Information about an assembly is controlled through the following
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
index aaa7acf..4046a7c 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
@@ -1,20 +1,23 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.IO;
4using System.Reflection;
5using System.Timers;
6using log4net;
3using Nini.Config; 7using Nini.Config;
4using OpenSim.Region.Environment.Interfaces; 8using OpenSim.Region.Environment.Interfaces;
5using OpenSim.Region.Environment.Scenes;
6using OpenSim.Region.Environment.Modules.ExportSerialiser; 9using OpenSim.Region.Environment.Modules.ExportSerialiser;
7 10using OpenSim.Region.Environment.Modules.Terrain;
8using PumaCode.SvnDotNet.SubversionSharp; 11using OpenSim.Region.Environment.Scenes;
9using PumaCode.SvnDotNet.AprSharp; 12using PumaCode.SvnDotNet.AprSharp;
10 13using PumaCode.SvnDotNet.SubversionSharp;
11using Slash=System.IO.Path; 14using Slash=System.IO.Path;
12 15
13namespace OpenSim.Region.Modules.SvnSerialiser 16namespace OpenSim.Region.Modules.SvnSerialiser
14{ 17{
15 public class SvnBackupModule : IRegionModule 18 public class SvnBackupModule : IRegionModule
16 { 19 {
17 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 20 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
18 21
19 private SvnClient m_svnClient; 22 private SvnClient m_svnClient;
20 private bool m_enabled = false; 23 private bool m_enabled = false;
@@ -26,7 +29,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
26 29
27 private TimeSpan m_svnperiod = new TimeSpan(0, 0, 15, 0, 0); 30 private TimeSpan m_svnperiod = new TimeSpan(0, 0, 15, 0, 0);
28 private bool m_svnAutoSave = false; 31 private bool m_svnAutoSave = false;
29 private System.Timers.Timer m_timer = new System.Timers.Timer(); 32 private Timer m_timer = new Timer();
30 33
31 private IRegionSerialiser m_serialiser; 34 private IRegionSerialiser m_serialiser;
32 private List<Scene> m_scenes = new List<Scene>(); 35 private List<Scene> m_scenes = new List<Scene>();
@@ -87,7 +90,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
87 { 90 {
88 scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString() + 91 scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString() +
89 Slash.DirectorySeparatorChar + "objects.xml"); 92 Slash.DirectorySeparatorChar + "objects.xml");
90 scene.RequestModuleInterface<OpenSim.Region.Environment.Modules.Terrain.ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString() + 93 scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString() +
91 Slash.DirectorySeparatorChar + "heightmap.r32"); 94 Slash.DirectorySeparatorChar + "heightmap.r32");
92 m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ")."); 95 m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ").");
93 } 96 }
@@ -104,16 +107,16 @@ namespace OpenSim.Region.Modules.SvnSerialiser
104 107
105 private void CheckoutSvnPartial(string subdir) 108 private void CheckoutSvnPartial(string subdir)
106 { 109 {
107 if (!System.IO.Directory.Exists(m_svndir + Slash.DirectorySeparatorChar + subdir)) 110 if (!Directory.Exists(m_svndir + Slash.DirectorySeparatorChar + subdir))
108 System.IO.Directory.CreateDirectory(m_svndir + Slash.DirectorySeparatorChar + subdir); 111 Directory.CreateDirectory(m_svndir + Slash.DirectorySeparatorChar + subdir);
109 112
110 m_svnClient.Checkout2(m_svnurl + "/" + subdir, m_svndir, Svn.Revision.Head, Svn.Revision.Head, true, false); 113 m_svnClient.Checkout2(m_svnurl + "/" + subdir, m_svndir, Svn.Revision.Head, Svn.Revision.Head, true, false);
111 } 114 }
112 115
113 private void CheckoutSvnPartial(string subdir, SvnRevision revision) 116 private void CheckoutSvnPartial(string subdir, SvnRevision revision)
114 { 117 {
115 if (!System.IO.Directory.Exists(m_svndir + Slash.DirectorySeparatorChar + subdir)) 118 if (!Directory.Exists(m_svndir + Slash.DirectorySeparatorChar + subdir))
116 System.IO.Directory.CreateDirectory(m_svndir + Slash.DirectorySeparatorChar + subdir); 119 Directory.CreateDirectory(m_svndir + Slash.DirectorySeparatorChar + subdir);
117 120
118 m_svnClient.Checkout2(m_svnurl + "/" + subdir, m_svndir, revision, revision, true, false); 121 m_svnClient.Checkout2(m_svnurl + "/" + subdir, m_svndir, revision, revision, true, false);
119 } 122 }
@@ -138,7 +141,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
138 { 141 {
139 foreach (SvnClientCommitItem2 item in commitItems) 142 foreach (SvnClientCommitItem2 item in commitItems)
140 { 143 {
141 m_log.Debug("[SVNBACKUP]: ... " + System.IO.Path.GetFileName(item.Path.ToString()) + " (" + item.Kind.ToString() + ") r" + item.Revision.ToString()); 144 m_log.Debug("[SVNBACKUP]: ... " + Path.GetFileName(item.Path.ToString()) + " (" + item.Kind.ToString() + ") r" + item.Revision.ToString());
142 } 145 }
143 } 146 }
144 147
@@ -277,7 +280,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
277 if (m_svnAutoSave == true) 280 if (m_svnAutoSave == true)
278 { 281 {
279 m_timer.Interval = m_svnperiod.TotalMilliseconds; 282 m_timer.Interval = m_svnperiod.TotalMilliseconds;
280 m_timer.Elapsed += new System.Timers.ElapsedEventHandler(m_timer_Elapsed); 283 m_timer.Elapsed += new ElapsedEventHandler(m_timer_Elapsed);
281 m_timer.AutoReset = true; 284 m_timer.AutoReset = true;
282 m_timer.Start(); 285 m_timer.Start();
283 } 286 }
@@ -300,7 +303,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
300 } 303 }
301 } 304 }
302 305
303 void m_timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) 306 void m_timer_Elapsed(object sender, ElapsedEventArgs e)
304 { 307 {
305 SaveAllRegions(); 308 SaveAllRegions();
306 } 309 }
@@ -322,8 +325,8 @@ namespace OpenSim.Region.Modules.SvnSerialiser
322 325
323 private void CreateSvnDirectory() 326 private void CreateSvnDirectory()
324 { 327 {
325 if (!System.IO.Directory.Exists(m_svndir)) 328 if (!Directory.Exists(m_svndir))
326 System.IO.Directory.CreateDirectory(m_svndir); 329 Directory.CreateDirectory(m_svndir);
327 } 330 }
328 331
329 public void Close() 332 public void Close()
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index 6cc7ff4..1ad1201 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -31,12 +31,10 @@ using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using MonoXnaCompactMaths; 32using MonoXnaCompactMaths;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Console;
35using OpenSim.Region.Physics.Manager; 34using OpenSim.Region.Physics.Manager;
36using XnaDevRu.BulletX; 35using XnaDevRu.BulletX;
37using XnaDevRu.BulletX.Dynamics; 36using XnaDevRu.BulletX.Dynamics;
38using AxiomQuaternion = Axiom.Math.Quaternion; 37using AxiomQuaternion = Axiom.Math.Quaternion;
39using BoxShape=XnaDevRu.BulletX.BoxShape;
40 38
41#endregion 39#endregion
42 40
diff --git a/OpenSim/Region/Physics/Manager/CollisionLocker.cs b/OpenSim/Region/Physics/Manager/CollisionLocker.cs
index f88554b..29a6188 100644
--- a/OpenSim/Region/Physics/Manager/CollisionLocker.cs
+++ b/OpenSim/Region/Physics/Manager/CollisionLocker.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.Region.Physics.Manager 31namespace OpenSim.Region.Physics.Manager
33{ 32{
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index 73b2721..e4ff725 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using OpenSim.Framework.Console; 32using log4net;
33 33
34namespace OpenSim.Region.Physics.Manager 34namespace OpenSim.Region.Physics.Manager
35{ 35{
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Physics.Manager
38 /// </summary> 38 /// </summary>
39 public class PhysicsPluginManager 39 public class PhysicsPluginManager
40 { 40 {
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 private Dictionary<string, IPhysicsPlugin> _PhysPlugins = new Dictionary<string, IPhysicsPlugin>(); 43 private Dictionary<string, IPhysicsPlugin> _PhysPlugins = new Dictionary<string, IPhysicsPlugin>();
44 private Dictionary<string, IMeshingPlugin> _MeshPlugins = new Dictionary<string, IMeshingPlugin>(); 44 private Dictionary<string, IMeshingPlugin> _MeshPlugins = new Dictionary<string, IMeshingPlugin>();
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index d3699a3..4c509b7 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.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.Reflection;
29using Axiom.Math; 29using Axiom.Math;
30using log4net;
30using OpenSim.Framework; 31using OpenSim.Framework;
31using OpenSim.Framework.Console;
32 32
33namespace OpenSim.Region.Physics.Manager 33namespace OpenSim.Region.Physics.Manager
34{ 34{
@@ -36,7 +36,7 @@ namespace OpenSim.Region.Physics.Manager
36 36
37 public abstract class PhysicsScene 37 public abstract class PhysicsScene
38 { 38 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 40
41 // The only thing that should register for this event is the InnerScene 41 // The only thing that should register for this event is the InnerScene
42 // Anything else could cause problems. 42 // Anything else could cause problems.
diff --git a/OpenSim/Region/Physics/Manager/PhysicsSensor.cs b/OpenSim/Region/Physics/Manager/PhysicsSensor.cs
index a86d283..ce53108 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsSensor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsSensor.cs
@@ -26,10 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Timers; 29using System.Timers;
31using Axiom.Math;
32using OpenSim.Framework;
33 30
34namespace OpenSim.Region.Physics.Manager 31namespace OpenSim.Region.Physics.Manager
35{ 32{
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index d4b6a50..db91028 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Console;
32using OpenSim.Region.Physics.Manager; 31using OpenSim.Region.Physics.Manager;
33 32
34namespace OpenSim.Region.Physics.Meshing 33namespace OpenSim.Region.Physics.Meshing
diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
index c518b78..2896d3b 100644
--- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs
+++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
@@ -27,7 +27,6 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Framework.Console;
31using OpenSim.Region.Physics.Manager; 30using OpenSim.Region.Physics.Manager;
32 31
33namespace OpenSim.Region.Physics.Meshing 32namespace OpenSim.Region.Physics.Meshing
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 81126b6..042042c 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Physics.OdePlugin
121 _acceleration = new PhysicsVector(); 121 _acceleration = new PhysicsVector();
122 _parent_scene = parent_scene; 122 _parent_scene = parent_scene;
123 123
124 if (System.Environment.OSVersion.Platform == PlatformID.Unix) 124 if (Environment.OSVersion.Platform == PlatformID.Unix)
125 { 125 {
126 m_tensor = 2000000f; 126 m_tensor = 2000000f;
127 } 127 }
@@ -413,7 +413,7 @@ namespace OpenSim.Region.Physics.OdePlugin
413 private void AvatarGeomAndBodyCreation(float npositionX, float npositionY, float npositionZ, float tensor) 413 private void AvatarGeomAndBodyCreation(float npositionX, float npositionY, float npositionZ, float tensor)
414 { 414 {
415 415
416 if (System.Environment.OSVersion.Platform == PlatformID.Unix) 416 if (Environment.OSVersion.Platform == PlatformID.Unix)
417 { 417 {
418 m_tensor = 2000000f; 418 m_tensor = 2000000f;
419 } 419 }
@@ -641,7 +641,7 @@ namespace OpenSim.Region.Physics.OdePlugin
641 641
642 // If the PID Controller isn't active then we set our force 642 // If the PID Controller isn't active then we set our force
643 // calculating base velocity to the current position 643 // calculating base velocity to the current position
644 if (System.Environment.OSVersion.Platform == PlatformID.Unix) 644 if (Environment.OSVersion.Platform == PlatformID.Unix)
645 { 645 {
646 PID_D = 3200.0f; 646 PID_D = 3200.0f;
647 PID_P = 1400.0f; 647 PID_P = 1400.0f;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 4e39eb4..8e0640b 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -27,8 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using System.Runtime.InteropServices; 31using System.Runtime.InteropServices;
32using System.Threading;
31using Axiom.Math; 33using Axiom.Math;
34using log4net;
32using Ode.NET; 35using Ode.NET;
33using OpenSim.Framework; 36using OpenSim.Framework;
34using OpenSim.Region.Physics.Manager; 37using OpenSim.Region.Physics.Manager;
@@ -37,7 +40,7 @@ namespace OpenSim.Region.Physics.OdePlugin
37{ 40{
38 public class OdePrim : PhysicsActor 41 public class OdePrim : PhysicsActor
39 { 42 {
40 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);
41 44
42 public PhysicsVector _position; 45 public PhysicsVector _position;
43 private PhysicsVector _velocity; 46 private PhysicsVector _velocity;
@@ -663,7 +666,7 @@ namespace OpenSim.Region.Physics.OdePlugin
663 // This sleeper is there to moderate how long it takes between 666 // This sleeper is there to moderate how long it takes between
664 // setting up the mesh and pre-processing it when we get rapid fire mesh requests on a single object 667 // setting up the mesh and pre-processing it when we get rapid fire mesh requests on a single object
665 668
666 System.Threading.Thread.Sleep(10); 669 Thread.Sleep(10);
667 670
668 //Kill Body so that mesh can re-make the geom 671 //Kill Body so that mesh can re-make the geom
669 if (IsPhysical && Body != (IntPtr) 0) 672 if (IsPhysical && Body != (IntPtr) 0)
@@ -692,7 +695,7 @@ namespace OpenSim.Region.Physics.OdePlugin
692 SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null)); 695 SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null));
693 } 696 }
694 } 697 }
695 catch (System.AccessViolationException) 698 catch (AccessViolationException)
696 { 699 {
697 700
698 m_log.Error("[PHYSICS]: MESH LOCKED"); 701 m_log.Error("[PHYSICS]: MESH LOCKED");
@@ -934,7 +937,7 @@ namespace OpenSim.Region.Physics.OdePlugin
934 { 937 {
935 SetGeom(d.CreateSphere(m_targetSpace, _size.X / 2)); 938 SetGeom(d.CreateSphere(m_targetSpace, _size.X / 2));
936 } 939 }
937 catch (System.AccessViolationException) 940 catch (AccessViolationException)
938 { 941 {
939 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object"); 942 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
940 ode.dunlock(_parent_scene.world); 943 ode.dunlock(_parent_scene.world);
@@ -948,7 +951,7 @@ namespace OpenSim.Region.Physics.OdePlugin
948 { 951 {
949 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z)); 952 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
950 } 953 }
951 catch (System.AccessViolationException) 954 catch (AccessViolationException)
952 { 955 {
953 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object"); 956 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
954 ode.dunlock(_parent_scene.world); 957 ode.dunlock(_parent_scene.world);
@@ -963,7 +966,7 @@ namespace OpenSim.Region.Physics.OdePlugin
963 { 966 {
964 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z)); 967 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
965 } 968 }
966 catch (System.AccessViolationException) 969 catch (AccessViolationException)
967 { 970 {
968 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object"); 971 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
969 ode.dunlock(_parent_scene.world); 972 ode.dunlock(_parent_scene.world);
@@ -990,7 +993,7 @@ namespace OpenSim.Region.Physics.OdePlugin
990 { 993 {
991 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z)); 994 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
992 } 995 }
993 catch (System.AccessViolationException) 996 catch (AccessViolationException)
994 { 997 {
995 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object"); 998 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
996 ode.dunlock(_parent_scene.world); 999 ode.dunlock(_parent_scene.world);
@@ -1135,7 +1138,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1135 1138
1136 // If the PID Controller isn't active then we set our force 1139 // If the PID Controller isn't active then we set our force
1137 // calculating base velocity to the current position 1140 // calculating base velocity to the current position
1138 if (System.Environment.OSVersion.Platform == PlatformID.Unix) 1141 if (Environment.OSVersion.Platform == PlatformID.Unix)
1139 { 1142 {
1140 PID_D = 3200.0f; 1143 PID_D = 3200.0f;
1141 //PID_P = 1400.0f; 1144 //PID_P = 1400.0f;
@@ -1670,7 +1673,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1670 { 1673 {
1671 1674
1672 1675
1673 System.Threading.Thread.Sleep(20); 1676 Thread.Sleep(20);
1674 if (IsPhysical) 1677 if (IsPhysical)
1675 { 1678 {
1676 if (Body != (IntPtr)0) 1679 if (Body != (IntPtr)0)
diff --git a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
index f56cf5c..94d98cb 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
@@ -26,15 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Runtime.InteropServices;
31using Axiom.Math; 29using Axiom.Math;
32using Ode.NET; 30using NUnit.Framework;
33using OpenSim.Framework; 31using OpenSim.Framework;
34using OpenSim.Framework.Console;
35using OpenSim.Region.Physics.Manager; 32using OpenSim.Region.Physics.Manager;
36using NUnit.Framework;
37using NUnit.Framework.SyntaxHelpers;
38 33
39namespace OpenSim.Region.Physics.OdePlugin 34namespace OpenSim.Region.Physics.OdePlugin
40{ 35{
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index a2f440e..c346960 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -27,11 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using System.Runtime.InteropServices; 31using System.Runtime.InteropServices;
32using System.Threading;
31using Axiom.Math; 33using Axiom.Math;
34using log4net;
32using Ode.NET; 35using Ode.NET;
33using OpenSim.Framework; 36using OpenSim.Framework;
34using OpenSim.Framework.Console;
35using OpenSim.Region.Physics.Manager; 37using OpenSim.Region.Physics.Manager;
36 38
37//using OpenSim.Region.Physics.OdePlugin.Meshing; 39//using OpenSim.Region.Physics.OdePlugin.Meshing;
@@ -114,12 +116,12 @@ namespace OpenSim.Region.Physics.OdePlugin
114 116
115 public class OdeScene : PhysicsScene 117 public class OdeScene : PhysicsScene
116 { 118 {
117 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 119 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
118 private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); 120 private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
119 121
120 CollisionLocker ode; 122 CollisionLocker ode;
121 123
122 protected Random fluidRandomizer = new Random(System.Environment.TickCount); 124 protected Random fluidRandomizer = new Random(Environment.TickCount);
123 125
124 private const uint m_regionWidth = Constants.RegionSize; 126 private const uint m_regionWidth = Constants.RegionSize;
125 private const uint m_regionHeight = Constants.RegionSize; 127 private const uint m_regionHeight = Constants.RegionSize;
@@ -331,7 +333,7 @@ namespace OpenSim.Region.Physics.OdePlugin
331 { 333 {
332 d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback); 334 d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback);
333 } 335 }
334 catch (System.AccessViolationException) 336 catch (AccessViolationException)
335 { 337 {
336 m_log.Warn("[PHYSICS]: Unable to collide test a space"); 338 m_log.Warn("[PHYSICS]: Unable to collide test a space");
337 return; 339 return;
@@ -404,7 +406,7 @@ namespace OpenSim.Region.Physics.OdePlugin
404 ode.drelease(world); 406 ode.drelease(world);
405 base.TriggerPhysicsBasedRestart(); 407 base.TriggerPhysicsBasedRestart();
406 } 408 }
407 catch (System.AccessViolationException) 409 catch (AccessViolationException)
408 { 410 {
409 411
410 m_log.Warn("[PHYSICS]: Unable to collide test an object"); 412 m_log.Warn("[PHYSICS]: Unable to collide test an object");
@@ -1166,7 +1168,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1166 } 1168 }
1167 1169
1168 } 1170 }
1169 catch (System.AccessViolationException) 1171 catch (AccessViolationException)
1170 { 1172 {
1171 m_log.Info("[PHYSICS]: Couldn't remove prim from physics scene, it was already be removed."); 1173 m_log.Info("[PHYSICS]: Couldn't remove prim from physics scene, it was already be removed.");
1172 } 1174 }
@@ -1243,7 +1245,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1243 // never be called if the prim is physical(active) 1245 // never be called if the prim is physical(active)
1244 1246
1245 // All physical prim end up in the root space 1247 // All physical prim end up in the root space
1246 System.Threading.Thread.Sleep(20); 1248 Thread.Sleep(20);
1247 if (currentspace != space) 1249 if (currentspace != space)
1248 { 1250 {
1249 //m_log.Info("[SPACE]: C:" + currentspace.ToString() + " g:" + geom.ToString()); 1251 //m_log.Info("[SPACE]: C:" + currentspace.ToString() + " g:" + geom.ToString());
diff --git a/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs
index a429272..1a50f0b 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.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 libsecondlife; 28using libsecondlife;
32using OpenSim.Region.Environment.Scenes; 29using OpenSim.Region.Environment.Scenes;
33 30
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index b6468c2..8aee94e 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -26,15 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Runtime.Remoting.Lifetime; 29using System.Runtime.Remoting.Lifetime;
31using System.Threading; 30using System.Threading;
32using OpenSim.Region.ScriptEngine.Common; 31using OpenSim.Region.Environment.Interfaces;
33using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; 32using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
34using integer = System.Int32; 33using integer = System.Int32;
35using key = System.String; 34using key = System.String;
36using vector = OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3; 35using vector = ScriptEngine.Common.LSL_Types.Vector3;
37using rotation = OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion; 36using rotation = Quaternion;
38 37
39namespace OpenSim.Region.ScriptEngine.Common 38namespace OpenSim.Region.ScriptEngine.Common
40{ 39{
@@ -151,7 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Common
151 // They are only forwarders to LSL_BuiltIn_Commands.cs 150 // They are only forwarders to LSL_BuiltIn_Commands.cs
152 // 151 //
153 152
154 public OpenSim.Region.Environment.Interfaces.ICommander GetCommander(string name) 153 public ICommander GetCommander(string name)
155 { 154 {
156 return m_LSL_Functions.GetCommander(name); 155 return m_LSL_Functions.GetCommander(name);
157 } 156 }
@@ -216,52 +215,52 @@ namespace OpenSim.Region.ScriptEngine.Common
216 return m_LSL_Functions.llRound(f); 215 return m_LSL_Functions.llRound(f);
217 } 216 }
218 217
219 public double llVecMag(vector v) 218 public double llVecMag(LSL_Types.Vector3 v)
220 { 219 {
221 return m_LSL_Functions.llVecMag(v); 220 return m_LSL_Functions.llVecMag(v);
222 } 221 }
223 222
224 public vector llVecNorm(vector v) 223 public LSL_Types.Vector3 llVecNorm(LSL_Types.Vector3 v)
225 { 224 {
226 return m_LSL_Functions.llVecNorm(v); 225 return m_LSL_Functions.llVecNorm(v);
227 } 226 }
228 227
229 public double llVecDist(vector a, vector b) 228 public double llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b)
230 { 229 {
231 return m_LSL_Functions.llVecDist(a, b); 230 return m_LSL_Functions.llVecDist(a, b);
232 } 231 }
233 232
234 public vector llRot2Euler(rotation r) 233 public LSL_Types.Vector3 llRot2Euler(LSL_Types.Quaternion r)
235 { 234 {
236 return m_LSL_Functions.llRot2Euler(r); 235 return m_LSL_Functions.llRot2Euler(r);
237 } 236 }
238 237
239 public rotation llEuler2Rot(vector v) 238 public LSL_Types.Quaternion llEuler2Rot(LSL_Types.Vector3 v)
240 { 239 {
241 return m_LSL_Functions.llEuler2Rot(v); 240 return m_LSL_Functions.llEuler2Rot(v);
242 } 241 }
243 242
244 public rotation llAxes2Rot(vector fwd, vector left, vector up) 243 public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up)
245 { 244 {
246 return m_LSL_Functions.llAxes2Rot(fwd, left, up); 245 return m_LSL_Functions.llAxes2Rot(fwd, left, up);
247 } 246 }
248 247
249 public vector llRot2Fwd(rotation r) 248 public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r)
250 { 249 {
251 return m_LSL_Functions.llRot2Fwd(r); 250 return m_LSL_Functions.llRot2Fwd(r);
252 } 251 }
253 252
254 public vector llRot2Left(rotation r) 253 public LSL_Types.Vector3 llRot2Left(LSL_Types.Quaternion r)
255 { 254 {
256 return m_LSL_Functions.llRot2Left(r); 255 return m_LSL_Functions.llRot2Left(r);
257 } 256 }
258 257
259 public vector llRot2Up(rotation r) 258 public LSL_Types.Vector3 llRot2Up(LSL_Types.Quaternion r)
260 { 259 {
261 return m_LSL_Functions.llRot2Up(r); 260 return m_LSL_Functions.llRot2Up(r);
262 } 261 }
263 262
264 public rotation llRotBetween(vector start, vector end) 263 public LSL_Types.Quaternion llRotBetween(LSL_Types.Vector3 start, LSL_Types.Vector3 end)
265 { 264 {
266 return m_LSL_Functions.llRotBetween(start, end); 265 return m_LSL_Functions.llRotBetween(start, end);
267 } 266 }
@@ -334,22 +333,22 @@ namespace OpenSim.Region.ScriptEngine.Common
334 return m_LSL_Functions.llDetectedType(number); 333 return m_LSL_Functions.llDetectedType(number);
335 } 334 }
336 335
337 public vector llDetectedPos(int number) 336 public LSL_Types.Vector3 llDetectedPos(int number)
338 { 337 {
339 return m_LSL_Functions.llDetectedPos(number); 338 return m_LSL_Functions.llDetectedPos(number);
340 } 339 }
341 340
342 public vector llDetectedVel(int number) 341 public LSL_Types.Vector3 llDetectedVel(int number)
343 { 342 {
344 return m_LSL_Functions.llDetectedVel(number); 343 return m_LSL_Functions.llDetectedVel(number);
345 } 344 }
346 345
347 public vector llDetectedGrab(int number) 346 public LSL_Types.Vector3 llDetectedGrab(int number)
348 { 347 {
349 return m_LSL_Functions.llDetectedGrab(number); 348 return m_LSL_Functions.llDetectedGrab(number);
350 } 349 }
351 350
352 public rotation llDetectedRot(int number) 351 public LSL_Types.Quaternion llDetectedRot(int number)
353 { 352 {
354 return m_LSL_Functions.llDetectedRot(number); 353 return m_LSL_Functions.llDetectedRot(number);
355 } 354 }
@@ -372,17 +371,17 @@ namespace OpenSim.Region.ScriptEngine.Common
372 m_LSL_Functions.llDie(); 371 m_LSL_Functions.llDie();
373 } 372 }
374 373
375 public double llGround(vector offset) 374 public double llGround(LSL_Types.Vector3 offset)
376 { 375 {
377 return m_LSL_Functions.llGround(offset); 376 return m_LSL_Functions.llGround(offset);
378 } 377 }
379 378
380 public double llCloud(vector offset) 379 public double llCloud(LSL_Types.Vector3 offset)
381 { 380 {
382 return m_LSL_Functions.llCloud(offset); 381 return m_LSL_Functions.llCloud(offset);
383 } 382 }
384 383
385 public vector llWind(vector offset) 384 public LSL_Types.Vector3 llWind(LSL_Types.Vector3 offset)
386 { 385 {
387 return m_LSL_Functions.llWind(offset); 386 return m_LSL_Functions.llWind(offset);
388 } 387 }
@@ -397,17 +396,17 @@ namespace OpenSim.Region.ScriptEngine.Common
397 return m_LSL_Functions.llGetStatus(status); 396 return m_LSL_Functions.llGetStatus(status);
398 } 397 }
399 398
400 public void llSetScale(vector scale) 399 public void llSetScale(LSL_Types.Vector3 scale)
401 { 400 {
402 m_LSL_Functions.llSetScale(scale); 401 m_LSL_Functions.llSetScale(scale);
403 } 402 }
404 403
405 public vector llGetScale() 404 public LSL_Types.Vector3 llGetScale()
406 { 405 {
407 return m_LSL_Functions.llGetScale(); 406 return m_LSL_Functions.llGetScale();
408 } 407 }
409 408
410 public void llSetColor(vector color, int face) 409 public void llSetColor(LSL_Types.Vector3 color, int face)
411 { 410 {
412 m_LSL_Functions.llSetColor(color, face); 411 m_LSL_Functions.llSetColor(color, face);
413 } 412 }
@@ -422,7 +421,7 @@ namespace OpenSim.Region.ScriptEngine.Common
422 m_LSL_Functions.llSetAlpha(alpha, face); 421 m_LSL_Functions.llSetAlpha(alpha, face);
423 } 422 }
424 423
425 public vector llGetColor(int face) 424 public LSL_Types.Vector3 llGetColor(int face)
426 { 425 {
427 return m_LSL_Functions.llGetColor(face); 426 return m_LSL_Functions.llGetColor(face);
428 } 427 }
@@ -455,47 +454,47 @@ namespace OpenSim.Region.ScriptEngine.Common
455 // 454 //
456 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 455 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
457 // 456 //
458 public void llSetPos(vector pos) 457 public void llSetPos(LSL_Types.Vector3 pos)
459 { 458 {
460 m_LSL_Functions.llSetPos(pos); 459 m_LSL_Functions.llSetPos(pos);
461 } 460 }
462 461
463 public vector llGetPos() 462 public LSL_Types.Vector3 llGetPos()
464 { 463 {
465 return m_LSL_Functions.llGetPos(); 464 return m_LSL_Functions.llGetPos();
466 } 465 }
467 466
468 public vector llGetLocalPos() 467 public LSL_Types.Vector3 llGetLocalPos()
469 { 468 {
470 return m_LSL_Functions.llGetLocalPos(); 469 return m_LSL_Functions.llGetLocalPos();
471 } 470 }
472 471
473 public void llSetRot(rotation rot) 472 public void llSetRot(LSL_Types.Quaternion rot)
474 { 473 {
475 m_LSL_Functions.llSetRot(rot); 474 m_LSL_Functions.llSetRot(rot);
476 } 475 }
477 476
478 public rotation llGetRot() 477 public LSL_Types.Quaternion llGetRot()
479 { 478 {
480 return m_LSL_Functions.llGetRot(); 479 return m_LSL_Functions.llGetRot();
481 } 480 }
482 481
483 public rotation llGetLocalRot() 482 public LSL_Types.Quaternion llGetLocalRot()
484 { 483 {
485 return m_LSL_Functions.llGetLocalRot(); 484 return m_LSL_Functions.llGetLocalRot();
486 } 485 }
487 486
488 public void llSetForce(vector force, int local) 487 public void llSetForce(LSL_Types.Vector3 force, int local)
489 { 488 {
490 m_LSL_Functions.llSetForce(force, local); 489 m_LSL_Functions.llSetForce(force, local);
491 } 490 }
492 491
493 public vector llGetForce() 492 public LSL_Types.Vector3 llGetForce()
494 { 493 {
495 return m_LSL_Functions.llGetForce(); 494 return m_LSL_Functions.llGetForce();
496 } 495 }
497 496
498 public int llTarget(vector position, double range) 497 public int llTarget(LSL_Types.Vector3 position, double range)
499 { 498 {
500 return m_LSL_Functions.llTarget(position, range); 499 return m_LSL_Functions.llTarget(position, range);
501 } 500 }
@@ -505,7 +504,7 @@ namespace OpenSim.Region.ScriptEngine.Common
505 m_LSL_Functions.llTargetRemove(number); 504 m_LSL_Functions.llTargetRemove(number);
506 } 505 }
507 506
508 public int llRotTarget(rotation rot, double error) 507 public int llRotTarget(LSL_Types.Quaternion rot, double error)
509 { 508 {
510 return m_LSL_Functions.llRotTarget(rot, error); 509 return m_LSL_Functions.llRotTarget(rot, error);
511 } 510 }
@@ -515,7 +514,7 @@ namespace OpenSim.Region.ScriptEngine.Common
515 m_LSL_Functions.llRotTargetRemove(number); 514 m_LSL_Functions.llRotTargetRemove(number);
516 } 515 }
517 516
518 public void llMoveToTarget(vector target, double tau) 517 public void llMoveToTarget(LSL_Types.Vector3 target, double tau)
519 { 518 {
520 m_LSL_Functions.llMoveToTarget(target, tau); 519 m_LSL_Functions.llMoveToTarget(target, tau);
521 } 520 }
@@ -525,7 +524,7 @@ namespace OpenSim.Region.ScriptEngine.Common
525 m_LSL_Functions.llStopMoveToTarget(); 524 m_LSL_Functions.llStopMoveToTarget();
526 } 525 }
527 526
528 public void llApplyImpulse(vector force, int local) 527 public void llApplyImpulse(LSL_Types.Vector3 force, int local)
529 { 528 {
530 m_LSL_Functions.llApplyImpulse(force, local); 529 m_LSL_Functions.llApplyImpulse(force, local);
531 } 530 }
@@ -533,37 +532,37 @@ namespace OpenSim.Region.ScriptEngine.Common
533 // 532 //
534 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 533 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
535 // 534 //
536 public void llApplyRotationalImpulse(vector force, int local) 535 public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local)
537 { 536 {
538 m_LSL_Functions.llApplyRotationalImpulse(force, local); 537 m_LSL_Functions.llApplyRotationalImpulse(force, local);
539 } 538 }
540 539
541 public void llSetTorque(vector torque, int local) 540 public void llSetTorque(LSL_Types.Vector3 torque, int local)
542 { 541 {
543 m_LSL_Functions.llSetTorque(torque, local); 542 m_LSL_Functions.llSetTorque(torque, local);
544 } 543 }
545 544
546 public vector llGetTorque() 545 public LSL_Types.Vector3 llGetTorque()
547 { 546 {
548 return m_LSL_Functions.llGetTorque(); 547 return m_LSL_Functions.llGetTorque();
549 } 548 }
550 549
551 public void llSetForceAndTorque(vector force, vector torque, int local) 550 public void llSetForceAndTorque(LSL_Types.Vector3 force, LSL_Types.Vector3 torque, int local)
552 { 551 {
553 m_LSL_Functions.llSetForceAndTorque(force, torque, local); 552 m_LSL_Functions.llSetForceAndTorque(force, torque, local);
554 } 553 }
555 554
556 public vector llGetVel() 555 public LSL_Types.Vector3 llGetVel()
557 { 556 {
558 return m_LSL_Functions.llGetVel(); 557 return m_LSL_Functions.llGetVel();
559 } 558 }
560 559
561 public vector llGetAccel() 560 public LSL_Types.Vector3 llGetAccel()
562 { 561 {
563 return m_LSL_Functions.llGetAccel(); 562 return m_LSL_Functions.llGetAccel();
564 } 563 }
565 564
566 public vector llGetOmega() 565 public LSL_Types.Vector3 llGetOmega()
567 { 566 {
568 return m_LSL_Functions.llGetOmega(); 567 return m_LSL_Functions.llGetOmega();
569 } 568 }
@@ -691,12 +690,12 @@ namespace OpenSim.Region.ScriptEngine.Common
691 m_LSL_Functions.llMakeFire(); 690 m_LSL_Functions.llMakeFire();
692 } 691 }
693 692
694 public void llRezObject(string inventory, vector pos, rotation rot, int param) 693 public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Quaternion rot, int param)
695 { 694 {
696 m_LSL_Functions.llRezObject(inventory, pos, rot, param); 695 m_LSL_Functions.llRezObject(inventory, pos, rot, param);
697 } 696 }
698 697
699 public void llLookAt(vector target, double strength, double damping) 698 public void llLookAt(LSL_Types.Vector3 target, double strength, double damping)
700 { 699 {
701 m_LSL_Functions.llLookAt(target, strength, damping); 700 m_LSL_Functions.llLookAt(target, strength, damping);
702 } 701 }
@@ -809,7 +808,7 @@ namespace OpenSim.Region.ScriptEngine.Common
809 m_LSL_Functions.llSoundPreload(); 808 m_LSL_Functions.llSoundPreload();
810 } 809 }
811 810
812 public void llRotLookAt(rotation target, double strength, double damping) 811 public void llRotLookAt(LSL_Types.Quaternion target, double strength, double damping)
813 { 812 {
814 m_LSL_Functions.llRotLookAt(target, strength, damping); 813 m_LSL_Functions.llRotLookAt(target, strength, damping);
815 } 814 }
@@ -842,7 +841,7 @@ namespace OpenSim.Region.ScriptEngine.Common
842 m_LSL_Functions.llStopPointAt(); 841 m_LSL_Functions.llStopPointAt();
843 } 842 }
844 843
845 public void llTargetOmega(vector axis, double spinrate, double gain) 844 public void llTargetOmega(LSL_Types.Vector3 axis, double spinrate, double gain)
846 { 845 {
847 m_LSL_Functions.llTargetOmega(axis, spinrate, gain); 846 m_LSL_Functions.llTargetOmega(axis, spinrate, gain);
848 } 847 }
@@ -852,7 +851,7 @@ namespace OpenSim.Region.ScriptEngine.Common
852 return m_LSL_Functions.llGetStartParameter(); 851 return m_LSL_Functions.llGetStartParameter();
853 } 852 }
854 853
855 public void llGodLikeRezObject(string inventory, vector pos) 854 public void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos)
856 { 855 {
857 m_LSL_Functions.llGodLikeRezObject(inventory, pos); 856 m_LSL_Functions.llGodLikeRezObject(inventory, pos);
858 } 857 }
@@ -877,7 +876,7 @@ namespace OpenSim.Region.ScriptEngine.Common
877 return m_LSL_Functions.llGetLinkNumber(); 876 return m_LSL_Functions.llGetLinkNumber();
878 } 877 }
879 878
880 public void llSetLinkColor(int linknumber, vector color, int face) 879 public void llSetLinkColor(int linknumber, LSL_Types.Vector3 color, int face)
881 { 880 {
882 m_LSL_Functions.llSetLinkColor(linknumber, color, face); 881 m_LSL_Functions.llSetLinkColor(linknumber, color, face);
883 } 882 }
@@ -940,12 +939,12 @@ namespace OpenSim.Region.ScriptEngine.Common
940 m_LSL_Functions.llRemoveInventory(item); 939 m_LSL_Functions.llRemoveInventory(item);
941 } 940 }
942 941
943 public void llSetText(string text, vector color, double alpha) 942 public void llSetText(string text, LSL_Types.Vector3 color, double alpha)
944 { 943 {
945 m_LSL_Functions.llSetText(text, color, alpha); 944 m_LSL_Functions.llSetText(text, color, alpha);
946 } 945 }
947 946
948 public double llWater(vector offset) 947 public double llWater(LSL_Types.Vector3 offset)
949 { 948 {
950 return m_LSL_Functions.llWater(offset); 949 return m_LSL_Functions.llWater(offset);
951 } 950 }
@@ -1005,7 +1004,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1005 m_LSL_Functions.llMessageLinked(linknum, num, str, id); 1004 m_LSL_Functions.llMessageLinked(linknum, num, str, id);
1006 } 1005 }
1007 1006
1008 public void llPushObject(string target, vector impulse, vector ang_impulse, int local) 1007 public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local)
1009 { 1008 {
1010 m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local); 1009 m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local);
1011 } 1010 }
@@ -1028,12 +1027,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1028 // 1027 //
1029 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 1028 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
1030 // 1029 //
1031 public rotation llAxisAngle2Rot(vector axis, double angle) 1030 public LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle)
1032 { 1031 {
1033 return m_LSL_Functions.llAxisAngle2Rot(axis, angle); 1032 return m_LSL_Functions.llAxisAngle2Rot(axis, angle);
1034 } 1033 }
1035 1034
1036 public vector llRot2Axis(rotation rot) 1035 public LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot)
1037 { 1036 {
1038 return m_LSL_Functions.llRot2Axis(rot); 1037 return m_LSL_Functions.llRot2Axis(rot);
1039 } 1038 }
@@ -1053,7 +1052,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1053 return m_LSL_Functions.llAsin(val); 1052 return m_LSL_Functions.llAsin(val);
1054 } 1053 }
1055 1054
1056 public double llAngleBetween(rotation a, rotation b) 1055 public double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b)
1057 { 1056 {
1058 return m_LSL_Functions.llAngleBetween(a, b); 1057 return m_LSL_Functions.llAngleBetween(a, b);
1059 } 1058 }
@@ -1068,17 +1067,17 @@ namespace OpenSim.Region.ScriptEngine.Common
1068 m_LSL_Functions.llAllowInventoryDrop(add); 1067 m_LSL_Functions.llAllowInventoryDrop(add);
1069 } 1068 }
1070 1069
1071 public vector llGetSunDirection() 1070 public LSL_Types.Vector3 llGetSunDirection()
1072 { 1071 {
1073 return m_LSL_Functions.llGetSunDirection(); 1072 return m_LSL_Functions.llGetSunDirection();
1074 } 1073 }
1075 1074
1076 public vector llGetTextureOffset(int face) 1075 public LSL_Types.Vector3 llGetTextureOffset(int face)
1077 { 1076 {
1078 return m_LSL_Functions.llGetTextureOffset(face); 1077 return m_LSL_Functions.llGetTextureOffset(face);
1079 } 1078 }
1080 1079
1081 public vector llGetTextureScale(int side) 1080 public LSL_Types.Vector3 llGetTextureScale(int side)
1082 { 1081 {
1083 return m_LSL_Functions.llGetTextureScale(side); 1082 return m_LSL_Functions.llGetTextureScale(side);
1084 } 1083 }
@@ -1098,7 +1097,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1098 return m_LSL_Functions.llGetOwnerKey(id); 1097 return m_LSL_Functions.llGetOwnerKey(id);
1099 } 1098 }
1100 1099
1101 public vector llGetCenterOfMass() 1100 public LSL_Types.Vector3 llGetCenterOfMass()
1102 { 1101 {
1103 return m_LSL_Functions.llGetCenterOfMass(); 1102 return m_LSL_Functions.llGetCenterOfMass();
1104 } 1103 }
@@ -1136,12 +1135,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1136 return m_LSL_Functions.llList2Key(src, index); 1135 return m_LSL_Functions.llList2Key(src, index);
1137 } 1136 }
1138 1137
1139 public vector llList2Vector(LSL_Types.list src, int index) 1138 public LSL_Types.Vector3 llList2Vector(LSL_Types.list src, int index)
1140 { 1139 {
1141 return m_LSL_Functions.llList2Vector(src, index); 1140 return m_LSL_Functions.llList2Vector(src, index);
1142 } 1141 }
1143 1142
1144 public rotation llList2Rot(LSL_Types.list src, int index) 1143 public LSL_Types.Quaternion llList2Rot(LSL_Types.list src, int index)
1145 { 1144 {
1146 return m_LSL_Functions.llList2Rot(src, index); 1145 return m_LSL_Functions.llList2Rot(src, index);
1147 } 1146 }
@@ -1181,7 +1180,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1181 return m_LSL_Functions.llList2ListStrided(src, start, end, stride); 1180 return m_LSL_Functions.llList2ListStrided(src, start, end, stride);
1182 } 1181 }
1183 1182
1184 public vector llGetRegionCorner() 1183 public LSL_Types.Vector3 llGetRegionCorner()
1185 { 1184 {
1186 return m_LSL_Functions.llGetRegionCorner(); 1185 return m_LSL_Functions.llGetRegionCorner();
1187 } 1186 }
@@ -1211,7 +1210,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1211 return m_LSL_Functions.llGetDate(); 1210 return m_LSL_Functions.llGetDate();
1212 } 1211 }
1213 1212
1214 public int llEdgeOfWorld(vector pos, vector dir) 1213 public int llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir)
1215 { 1214 {
1216 return m_LSL_Functions.llEdgeOfWorld(pos, dir); 1215 return m_LSL_Functions.llEdgeOfWorld(pos, dir);
1217 } 1216 }
@@ -1249,7 +1248,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1249 m_LSL_Functions.llSetTextureAnim(mode, face, sizex, sizey, start, length, rate); 1248 m_LSL_Functions.llSetTextureAnim(mode, face, sizex, sizey, start, length, rate);
1250 } 1249 }
1251 1250
1252 public void llTriggerSoundLimited(string sound, double volume, vector top_north_east, vector bottom_south_west) 1251 public void llTriggerSoundLimited(string sound, double volume, LSL_Types.Vector3 top_north_east, LSL_Types.Vector3 bottom_south_west)
1253 { 1252 {
1254 m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west); 1253 m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west);
1255 } 1254 }
@@ -1269,7 +1268,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1269 return m_LSL_Functions.llOverMyLand(id); 1268 return m_LSL_Functions.llOverMyLand(id);
1270 } 1269 }
1271 1270
1272 public string llGetLandOwnerAt(vector pos) 1271 public string llGetLandOwnerAt(LSL_Types.Vector3 pos)
1273 { 1272 {
1274 return m_LSL_Functions.llGetLandOwnerAt(pos); 1273 return m_LSL_Functions.llGetLandOwnerAt(pos);
1275 } 1274 }
@@ -1279,7 +1278,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1279 return m_LSL_Functions.llGetNotecardLine(name, line); 1278 return m_LSL_Functions.llGetNotecardLine(name, line);
1280 } 1279 }
1281 1280
1282 public vector llGetAgentSize(string id) 1281 public LSL_Types.Vector3 llGetAgentSize(string id)
1283 { 1282 {
1284 return m_LSL_Functions.llGetAgentSize(id); 1283 return m_LSL_Functions.llGetAgentSize(id);
1285 } 1284 }
@@ -1294,17 +1293,17 @@ namespace OpenSim.Region.ScriptEngine.Common
1294 m_LSL_Functions.llUnSit(id); 1293 m_LSL_Functions.llUnSit(id);
1295 } 1294 }
1296 1295
1297 public vector llGroundSlope(vector offset) 1296 public LSL_Types.Vector3 llGroundSlope(LSL_Types.Vector3 offset)
1298 { 1297 {
1299 return m_LSL_Functions.llGroundSlope(offset); 1298 return m_LSL_Functions.llGroundSlope(offset);
1300 } 1299 }
1301 1300
1302 public vector llGroundNormal(vector offset) 1301 public LSL_Types.Vector3 llGroundNormal(LSL_Types.Vector3 offset)
1303 { 1302 {
1304 return m_LSL_Functions.llGroundNormal(offset); 1303 return m_LSL_Functions.llGroundNormal(offset);
1305 } 1304 }
1306 1305
1307 public vector llGroundContour(vector offset) 1306 public LSL_Types.Vector3 llGroundContour(LSL_Types.Vector3 offset)
1308 { 1307 {
1309 return m_LSL_Functions.llGroundContour(offset); 1308 return m_LSL_Functions.llGroundContour(offset);
1310 } 1309 }
@@ -1362,12 +1361,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1362 m_LSL_Functions.llSetVehicledoubleParam(param, value); 1361 m_LSL_Functions.llSetVehicledoubleParam(param, value);
1363 } 1362 }
1364 1363
1365 public void llSetVehicleVectorParam(int param, vector vec) 1364 public void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec)
1366 { 1365 {
1367 m_LSL_Functions.llSetVehicleVectorParam(param, vec); 1366 m_LSL_Functions.llSetVehicleVectorParam(param, vec);
1368 } 1367 }
1369 1368
1370 public void llSetVehicleRotationParam(int param, rotation rot) 1369 public void llSetVehicleRotationParam(int param, LSL_Types.Quaternion rot)
1371 { 1370 {
1372 m_LSL_Functions.llSetVehicleRotationParam(param, rot); 1371 m_LSL_Functions.llSetVehicleRotationParam(param, rot);
1373 } 1372 }
@@ -1382,7 +1381,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1382 m_LSL_Functions.llRemoveVehicleFlags(flags); 1381 m_LSL_Functions.llRemoveVehicleFlags(flags);
1383 } 1382 }
1384 1383
1385 public void llSitTarget(vector offset, rotation rot) 1384 public void llSitTarget(LSL_Types.Vector3 offset, LSL_Types.Quaternion rot)
1386 { 1385 {
1387 m_LSL_Functions.llSitTarget(offset, rot); 1386 m_LSL_Functions.llSitTarget(offset, rot);
1388 } 1387 }
@@ -1407,12 +1406,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1407 m_LSL_Functions.llSetSitText(text); 1406 m_LSL_Functions.llSetSitText(text);
1408 } 1407 }
1409 1408
1410 public void llSetCameraEyeOffset(vector offset) 1409 public void llSetCameraEyeOffset(LSL_Types.Vector3 offset)
1411 { 1410 {
1412 m_LSL_Functions.llSetCameraEyeOffset(offset); 1411 m_LSL_Functions.llSetCameraEyeOffset(offset);
1413 } 1412 }
1414 1413
1415 public void llSetCameraAtOffset(vector offset) 1414 public void llSetCameraAtOffset(LSL_Types.Vector3 offset)
1416 { 1415 {
1417 m_LSL_Functions.llSetCameraAtOffset(offset); 1416 m_LSL_Functions.llSetCameraAtOffset(offset);
1418 } 1417 }
@@ -1422,7 +1421,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1422 return m_LSL_Functions.llDumpList2String(src, seperator); 1421 return m_LSL_Functions.llDumpList2String(src, seperator);
1423 } 1422 }
1424 1423
1425 public void llScriptDanger(vector pos) 1424 public void llScriptDanger(LSL_Types.Vector3 pos)
1426 { 1425 {
1427 m_LSL_Functions.llScriptDanger(pos); 1426 m_LSL_Functions.llScriptDanger(pos);
1428 } 1427 }
@@ -1539,12 +1538,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1539 m_LSL_Functions.llSetParcelMusicURL(url); 1538 m_LSL_Functions.llSetParcelMusicURL(url);
1540 } 1539 }
1541 1540
1542 public vector llGetRootPosition() 1541 public LSL_Types.Vector3 llGetRootPosition()
1543 { 1542 {
1544 return m_LSL_Functions.llGetRootPosition(); 1543 return m_LSL_Functions.llGetRootPosition();
1545 } 1544 }
1546 1545
1547 public rotation llGetRootRotation() 1546 public LSL_Types.Quaternion llGetRootRotation()
1548 { 1547 {
1549 return m_LSL_Functions.llGetRootRotation(); 1548 return m_LSL_Functions.llGetRootRotation();
1550 } 1549 }
@@ -1589,7 +1588,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1589 return m_LSL_Functions.llGetBoundingBox(obj); 1588 return m_LSL_Functions.llGetBoundingBox(obj);
1590 } 1589 }
1591 1590
1592 public vector llGetGeometricCenter() 1591 public LSL_Types.Vector3 llGetGeometricCenter()
1593 { 1592 {
1594 return m_LSL_Functions.llGetGeometricCenter(); 1593 return m_LSL_Functions.llGetGeometricCenter();
1595 } 1594 }
@@ -1622,7 +1621,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1622 return m_LSL_Functions.llGetSimulatorHostname(); 1621 return m_LSL_Functions.llGetSimulatorHostname();
1623 } 1622 }
1624 1623
1625 public void llSetLocalRot(rotation rot) 1624 public void llSetLocalRot(LSL_Types.Quaternion rot)
1626 { 1625 {
1627 m_LSL_Functions.llSetLocalRot(rot); 1626 m_LSL_Functions.llSetLocalRot(rot);
1628 } 1627 }
@@ -1632,7 +1631,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1632 return m_LSL_Functions.llParseStringKeepNulls(src, seperators, spacers); 1631 return m_LSL_Functions.llParseStringKeepNulls(src, seperators, spacers);
1633 } 1632 }
1634 1633
1635 public void llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, int param) 1634 public void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, LSL_Types.Quaternion rot, int param)
1636 { 1635 {
1637 m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param); 1636 m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param);
1638 } 1637 }
@@ -1720,12 +1719,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1720 m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons); 1719 m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons);
1721 } 1720 }
1722 1721
1723 public vector llGetCameraPos() 1722 public LSL_Types.Vector3 llGetCameraPos()
1724 { 1723 {
1725 return m_LSL_Functions.llGetCameraPos(); 1724 return m_LSL_Functions.llGetCameraPos();
1726 } 1725 }
1727 1726
1728 public rotation llGetCameraRot() 1727 public LSL_Types.Quaternion llGetCameraRot()
1729 { 1728 {
1730 return m_LSL_Functions.llGetCameraRot(); 1729 return m_LSL_Functions.llGetCameraRot();
1731 } 1730 }
@@ -1750,7 +1749,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1750 return m_LSL_Functions.llUnescapeURL(url); 1749 return m_LSL_Functions.llUnescapeURL(url);
1751 } 1750 }
1752 1751
1753 public void llMapDestination(string simname, vector pos, vector look_at) 1752 public void llMapDestination(string simname, LSL_Types.Vector3 pos, LSL_Types.Vector3 look_at)
1754 { 1753 {
1755 m_LSL_Functions.llMapDestination(simname, pos, look_at); 1754 m_LSL_Functions.llMapDestination(simname, pos, look_at);
1756 } 1755 }
@@ -1790,7 +1789,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1790 return m_LSL_Functions.llGetUnixTime(); 1789 return m_LSL_Functions.llGetUnixTime();
1791 } 1790 }
1792 1791
1793 public int llGetParcelFlags(vector pos) 1792 public int llGetParcelFlags(LSL_Types.Vector3 pos)
1794 { 1793 {
1795 return m_LSL_Functions.llGetParcelFlags(pos); 1794 return m_LSL_Functions.llGetParcelFlags(pos);
1796 } 1795 }
@@ -1820,12 +1819,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1820 m_LSL_Functions.llResetLandPassList(); 1819 m_LSL_Functions.llResetLandPassList();
1821 } 1820 }
1822 1821
1823 public int llGetParcelPrimCount(vector pos, int category, int sim_wide) 1822 public int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide)
1824 { 1823 {
1825 return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); 1824 return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide);
1826 } 1825 }
1827 1826
1828 public LSL_Types.list llGetParcelPrimOwners(vector pos) 1827 public LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos)
1829 { 1828 {
1830 return m_LSL_Functions.llGetParcelPrimOwners(pos); 1829 return m_LSL_Functions.llGetParcelPrimOwners(pos);
1831 } 1830 }
@@ -1838,12 +1837,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1838 // 1837 //
1839 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 1838 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
1840 // 1839 //
1841 public int llGetParcelMaxPrims(vector pos, int sim_wide) 1840 public int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide)
1842 { 1841 {
1843 return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); 1842 return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide);
1844 } 1843 }
1845 1844
1846 public LSL_Types.list llGetParcelDetails(vector pos, LSL_Types.list param) 1845 public LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param)
1847 { 1846 {
1848 return m_LSL_Functions.llGetParcelDetails(pos, param); 1847 return m_LSL_Functions.llGetParcelDetails(pos, param);
1849 } 1848 }
@@ -2381,7 +2380,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2381 public const int OBJECT_CREATOR = 8; 2380 public const int OBJECT_CREATOR = 8;
2382 2381
2383 // Can not be public const? 2382 // Can not be public const?
2384 public vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0); 2383 public LSL_Types.Vector3 ZERO_VECTOR = new LSL_Types.Vector3(0.0, 0.0, 0.0);
2385 public rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0); 2384 public LSL_Types.Quaternion ZERO_ROTATION = new LSL_Types.Quaternion(0.0, 0, 0.0, 1.0);
2386 } 2385 }
2387} 2386}
diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs
index 45f7355..8e0d6f1 100644
--- a/OpenSim/Region/ScriptEngine/Common/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Runtime.Remoting.Lifetime;
32 31
33namespace OpenSim.Region.ScriptEngine.Common 32namespace OpenSim.Region.ScriptEngine.Common
34{ 33{
diff --git a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
index 50eb56f..19fb487 100644
--- a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Runtime.Remoting.Lifetime; 29using System.Runtime.Remoting.Lifetime;
31using System.Text;
32 30
33namespace OpenSim.Region.ScriptEngine.Common 31namespace OpenSim.Region.ScriptEngine.Common
34{ 32{
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index c00254d..04f8967 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -34,13 +34,12 @@ using System.Threading;
34using Axiom.Math; 34using Axiom.Math;
35using libsecondlife; 35using libsecondlife;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications; 37using OpenSim.Region.Environment;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Environment.Modules.LandManagement;
39using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Environment.Scenes;
40using OpenSim.Region.ScriptEngine.Common;
41using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; 41using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
42using OpenSim.Region.Environment; 42
43using OpenSim.Region.Environment.Modules.LandManagement;
44//using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL; 43//using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL;
45 44
46namespace OpenSim.Region.ScriptEngine.Common 45namespace OpenSim.Region.ScriptEngine.Common
@@ -86,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Common
86 } 85 }
87 catch (AppDomainUnloadedException) 86 catch (AppDomainUnloadedException)
88 { 87 {
89 System.Console.WriteLine("[SCRIPT]: state change called when script was unloaded. Nothing to worry about, but noting the occurance"); 88 Console.WriteLine("[SCRIPT]: state change called when script was unloaded. Nothing to worry about, but noting the occurance");
90 } 89 }
91 } 90 }
92 } 91 }
@@ -1677,10 +1676,10 @@ namespace OpenSim.Region.ScriptEngine.Common
1677 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 1676 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
1678 1677
1679 GridInstantMessage msg = new GridInstantMessage(); 1678 GridInstantMessage msg = new GridInstantMessage();
1680 msg.fromAgentID = new System.Guid(m_host.UUID.ToString()); // fromAgentID.UUID; 1679 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.UUID;
1681 msg.fromAgentSession = new System.Guid(friendTransactionID.ToString());// fromAgentSession.UUID; 1680 msg.fromAgentSession = new Guid(friendTransactionID.ToString());// fromAgentSession.UUID;
1682 msg.toAgentID = new System.Guid(user); // toAgentID.UUID; 1681 msg.toAgentID = new Guid(user); // toAgentID.UUID;
1683 msg.imSessionID = new System.Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 1682 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
1684 Console.WriteLine("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 1683 Console.WriteLine("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
1685 Console.WriteLine("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 1684 Console.WriteLine("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
1686 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 1685 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp;
@@ -2654,7 +2653,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2654 { 2653 {
2655 return new LSL_Types.Vector3(0, 0, 0); 2654 return new LSL_Types.Vector3(0, 0, 0);
2656 } 2655 }
2657 if (src.Data[index].GetType() == typeof(OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3)) 2656 if (src.Data[index].GetType() == typeof(LSL_Types.Vector3))
2658 { 2657 {
2659 return (LSL_Types.Vector3)src.Data[index]; 2658 return (LSL_Types.Vector3)src.Data[index];
2660 } 2659 }
@@ -2675,7 +2674,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2675 { 2674 {
2676 return new LSL_Types.Quaternion(0, 0, 0, 1); 2675 return new LSL_Types.Quaternion(0, 0, 0, 1);
2677 } 2676 }
2678 if (src.Data[index].GetType() == typeof(OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion)) 2677 if (src.Data[index].GetType() == typeof(LSL_Types.Quaternion))
2679 { 2678 {
2680 return (LSL_Types.Quaternion)src.Data[index]; 2679 return (LSL_Types.Quaternion)src.Data[index];
2681 } 2680 }
@@ -2713,11 +2712,11 @@ namespace OpenSim.Region.ScriptEngine.Common
2713 return 0; 2712 return 0;
2714 } 2713 }
2715 2714
2716 if (src.Data[index] is System.Int32) 2715 if (src.Data[index] is Int32)
2717 return 1; 2716 return 1;
2718 if (src.Data[index] is System.Double) 2717 if (src.Data[index] is Double)
2719 return 2; 2718 return 2;
2720 if (src.Data[index] is System.String) 2719 if (src.Data[index] is String)
2721 { 2720 {
2722 LLUUID tuuid; 2721 LLUUID tuuid;
2723 if (LLUUID.TryParse(src.Data[index].ToString(), out tuuid)) 2722 if (LLUUID.TryParse(src.Data[index].ToString(), out tuuid))
@@ -2729,11 +2728,11 @@ namespace OpenSim.Region.ScriptEngine.Common
2729 return 4; 2728 return 4;
2730 } 2729 }
2731 } 2730 }
2732 if (src.Data[index] is OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3) 2731 if (src.Data[index] is LSL_Types.Vector3)
2733 return 5; 2732 return 5;
2734 if (src.Data[index] is OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion) 2733 if (src.Data[index] is LSL_Types.Quaternion)
2735 return 6; 2734 return 6;
2736 if (src.Data[index] is OpenSim.Region.ScriptEngine.Common.LSL_Types.list) 2735 if (src.Data[index] is LSL_Types.list)
2737 return 7; 2736 return 7;
2738 return 0; 2737 return 0;
2739 2738
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index 8d8e0bc..fa957bb 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Collections.Generic; 28using OpenSim.Region.Environment.Interfaces;
29 29
30namespace OpenSim.Region.ScriptEngine.Common 30namespace OpenSim.Region.ScriptEngine.Common
31{ 31{
@@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Common
35 35
36 string State { get; set; } 36 string State { get; set; }
37 37
38 OpenSim.Region.Environment.Interfaces.ICommander GetCommander(string name); 38 ICommander GetCommander(string name);
39 39
40 double llSin(double f); 40 double llSin(double f);
41 double llCos(double f); 41 double llCos(double f);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index 55c13a4..7a8b4ca 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -26,8 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Text.RegularExpressions;
30using System.Collections; 29using System.Collections;
30using System.Text.RegularExpressions;
31 31
32namespace OpenSim.Region.ScriptEngine.Common 32namespace OpenSim.Region.ScriptEngine.Common
33{ 33{
@@ -639,7 +639,7 @@ namespace OpenSim.Region.ScriptEngine.Common
639 public double GeometricMean() 639 public double GeometricMean()
640 { 640 {
641 double ret = 1.0; 641 double ret = 1.0;
642 list nums = list.ToDoubleList(this); 642 list nums = ToDoubleList(this);
643 for (int i = 0; i < nums.Data.Length; i++) 643 for (int i = 0; i < nums.Data.Length; i++)
644 { 644 {
645 ret *= (double)nums.Data[i]; 645 ret *= (double)nums.Data[i];
@@ -650,7 +650,7 @@ namespace OpenSim.Region.ScriptEngine.Common
650 public double HarmonicMean() 650 public double HarmonicMean()
651 { 651 {
652 double ret = 0.0; 652 double ret = 0.0;
653 list nums = list.ToDoubleList(this); 653 list nums = ToDoubleList(this);
654 for (int i = 0; i < nums.Data.Length; i++) 654 for (int i = 0; i < nums.Data.Length; i++)
655 { 655 {
656 ret += 1.0 / (double)nums.Data[i]; 656 ret += 1.0 / (double)nums.Data[i];
@@ -661,7 +661,7 @@ namespace OpenSim.Region.ScriptEngine.Common
661 public double Variance() 661 public double Variance()
662 { 662 {
663 double s = 0; 663 double s = 0;
664 list num = list.ToDoubleList(this); 664 list num = ToDoubleList(this);
665 for (int i = 0; i < num.Data.Length; i++) 665 for (int i = 0; i < num.Data.Length; i++)
666 { 666 {
667 s += Math.Pow((double)num.Data[i], 2); 667 s += Math.Pow((double)num.Data[i], 2);
@@ -701,7 +701,7 @@ namespace OpenSim.Region.ScriptEngine.Common
701 output = "["; 701 output = "[";
702 foreach (object o in m_data) 702 foreach (object o in m_data)
703 { 703 {
704 if (o is System.String) 704 if (o is String)
705 { 705 {
706 output = output + "\"" + o + "\", "; 706 output = output + "\"" + o + "\", ";
707 } 707 }
@@ -837,7 +837,7 @@ namespace OpenSim.Region.ScriptEngine.Common
837 837
838 #region Operators 838 #region Operators
839 839
840 static public implicit operator System.Boolean(key k) 840 static public implicit operator Boolean(key k)
841 { 841 {
842 if (k.value.Length == 0) 842 if (k.value.Length == 0)
843 { 843 {
@@ -864,7 +864,7 @@ namespace OpenSim.Region.ScriptEngine.Common
864 return new key(s); 864 return new key(s);
865 } 865 }
866 866
867 static public implicit operator System.String(key k) 867 static public implicit operator String(key k)
868 { 868 {
869 return k.value; 869 return k.value;
870 } 870 }
@@ -917,7 +917,7 @@ namespace OpenSim.Region.ScriptEngine.Common
917 #endregion 917 #endregion
918 918
919 #region Operators 919 #region Operators
920 static public implicit operator System.Boolean(LSLString s) 920 static public implicit operator Boolean(LSLString s)
921 { 921 {
922 if (s.m_string.Length == 0) 922 if (s.m_string.Length == 0)
923 { 923 {
@@ -929,7 +929,7 @@ namespace OpenSim.Region.ScriptEngine.Common
929 } 929 }
930 } 930 }
931 931
932 static public implicit operator System.String(LSLString s) 932 static public implicit operator String(LSLString s)
933 { 933 {
934 return s.m_string; 934 return s.m_string;
935 } 935 }
@@ -1017,12 +1017,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1017 } 1017 }
1018 1018
1019 #endregion 1019 #endregion
1020 static public implicit operator System.Int32(LSLInteger i) 1020 static public implicit operator Int32(LSLInteger i)
1021 { 1021 {
1022 return i.value; 1022 return i.value;
1023 } 1023 }
1024 1024
1025 static public implicit operator System.Boolean(LSLInteger i) 1025 static public implicit operator Boolean(LSLInteger i)
1026 { 1026 {
1027 if (i.value == 0) 1027 if (i.value == 0)
1028 { 1028 {
@@ -1086,7 +1086,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1086 1086
1087 #region Operators 1087 #region Operators
1088 1088
1089 static public implicit operator System.Double(LSLFloat f) 1089 static public implicit operator Double(LSLFloat f)
1090 { 1090 {
1091 return f.value; 1091 return f.value;
1092 } 1092 }
@@ -1097,7 +1097,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1097 //} 1097 //}
1098 1098
1099 1099
1100 static public implicit operator System.Boolean(LSLFloat f) 1100 static public implicit operator Boolean(LSLFloat f)
1101 { 1101 {
1102 if (f.value == 0) 1102 if (f.value == 0)
1103 { 1103 {
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
index de19f4e..b919f8d 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
@@ -25,21 +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 */
27using System; 27using System;
28using System.Collections;
29using System.Collections.Generic;
30using System.Runtime.Remoting.Lifetime;
31using System.Text;
32using System.Threading;
33using Axiom.Math; 28using Axiom.Math;
34using libsecondlife; 29using libsecondlife;
35using OpenSim.Framework; 30using Nini.Config;
36using OpenSim.Framework.Communications; 31using OpenSim.Framework.Console;
37using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
39using OpenSim.Region.ScriptEngine.Common; 34
40using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
41using OpenSim.Region.Environment;
42using OpenSim.Region.Environment.Modules.LandManagement;
43//using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL; 35//using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL;
44 36
45namespace OpenSim.Region.ScriptEngine.Common 37namespace OpenSim.Region.ScriptEngine.Common
@@ -408,7 +400,7 @@ namespace OpenSim.Region.ScriptEngine.Common
408 public bool osConsoleCommand(string command) 400 public bool osConsoleCommand(string command)
409 { 401 {
410 m_host.AddScriptLPS(1); 402 m_host.AddScriptLPS(1);
411 Nini.Config.IConfigSource config = new Nini.Config.IniConfigSource(Application.iniFilePath); 403 IConfigSource config = new IniConfigSource(Application.iniFilePath);
412 if (config.Configs["LL-Functions"] == null) 404 if (config.Configs["LL-Functions"] == null)
413 config.AddConfig("LL-Functions"); 405 config.AddConfig("LL-Functions");
414 406
@@ -416,7 +408,7 @@ namespace OpenSim.Region.ScriptEngine.Common
416 { 408 {
417 if (World.PermissionsMngr.CanRunConsoleCommand(m_host.OwnerID)) 409 if (World.PermissionsMngr.CanRunConsoleCommand(m_host.OwnerID))
418 { 410 {
419 OpenSim.Framework.Console.MainConsole.Instance.RunCommand(command); 411 MainConsole.Instance.RunCommand(command);
420 return true; 412 return true;
421 } 413 }
422 return false; 414 return false;
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs
index 3102e3f..a4dd3b0 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.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.Region.ScriptEngine.Common 28namespace OpenSim.Region.ScriptEngine.Common
33{ 29{
34 public interface OSSL_BuilIn_Commands_Interface 30 public interface OSSL_BuilIn_Commands_Interface
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
index 41100c9..262d75f 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
@@ -29,7 +29,6 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using OpenSim.Region.ScriptEngine.Common;
33 32
34namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 33namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
35{ 34{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs
index a1bb5c9..7dad7ee 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs
@@ -25,16 +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;
29using System.Collections; 28using System.Collections;
30using System.Collections.Generic;
31using System.Threading; 29using System.Threading;
32using libsecondlife; 30using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins; 33using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins;
39using Timer=OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins.Timer; 34using Timer=OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins.Timer;
40 35
@@ -50,11 +45,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
50 45
51 public ScriptEngine m_ScriptEngine; 46 public ScriptEngine m_ScriptEngine;
52 47
53 public AsyncCommandPlugins.Timer m_Timer; 48 public Timer m_Timer;
54 public AsyncCommandPlugins.HttpRequest m_HttpRequest; 49 public HttpRequest m_HttpRequest;
55 public AsyncCommandPlugins.Listener m_Listener; 50 public Listener m_Listener;
56 public AsyncCommandPlugins.SensorRepeat m_SensorRepeat; 51 public SensorRepeat m_SensorRepeat;
57 public AsyncCommandPlugins.XmlRequest m_XmlRequest; 52 public XmlRequest m_XmlRequest;
58 53
59 public AsyncCommandManager(ScriptEngine _ScriptEngine) 54 public AsyncCommandManager(ScriptEngine _ScriptEngine)
60 { 55 {
@@ -81,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
81 cmdHandlerThread.Priority = ThreadPriority.BelowNormal; 76 cmdHandlerThread.Priority = ThreadPriority.BelowNormal;
82 cmdHandlerThread.IsBackground = true; 77 cmdHandlerThread.IsBackground = true;
83 cmdHandlerThread.Start(); 78 cmdHandlerThread.Start();
84 OpenSim.Framework.ThreadTracker.Add(cmdHandlerThread); 79 ThreadTracker.Add(cmdHandlerThread);
85 } 80 }
86 } 81 }
87 82
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs
index d62734f..521402e 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs
@@ -26,16 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Threading;
32using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules; 30using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework;
38using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins;
39 31
40namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins 32namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins
41{ 33{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs
index 00cbd8c..874a905 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs
@@ -25,16 +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;
30using System.Collections.Generic;
31using System.Threading;
32using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules; 29using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework;
38 30
39namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins 31namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins
40{ 32{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
index fd8dbd1..71ae80c 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
@@ -26,15 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Threading;
32using libsecondlife; 30using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes;
38 33
39namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins 34namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins
40{ 35{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs
index 63a8d19..141e471 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs
@@ -28,13 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Threading;
32using libsecondlife; 31using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework;
38 32
39namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins 33namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins
40{ 34{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs
index be4f418..c3e1804 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Threading;
32using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules; 30using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework;
38 31
39namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins 32namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins
40{ 33{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
index 2f2b384..b4789a9 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
35 /// Prepares events so they can be directly executed upon a script by EventQueueManager, then queues it. 35 /// Prepares events so they can be directly executed upon a script by EventQueueManager, then queues it.
36 /// </summary> 36 /// </summary>
37 [Serializable] 37 [Serializable]
38 public class EventManager : OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.RemoteEvents, iScriptEngineFunctionModule 38 public class EventManager : ScriptServerInterfaces.RemoteEvents, iScriptEngineFunctionModule
39 { 39 {
40 // 40 //
41 // Class is instanced in "ScriptEngine" and Uses "EventQueueManager" that is also instanced in "ScriptEngine". 41 // Class is instanced in "ScriptEngine" and Uses "EventQueueManager" that is also instanced in "ScriptEngine".
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
index cd03699..7cbbd4f 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
@@ -28,10 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Threading;
32using libsecondlife; 31using libsecondlife;
33using OpenSim.Framework;
34using OpenSim.Region.Environment.Scenes.Scripting;
35 32
36namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 33namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
37{ 34{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
index b8d950a..d77f698 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
@@ -27,11 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using System.Threading; 30using System.Threading;
33using libsecondlife; 31using libsecondlife;
34using Nini.Config;
35using OpenSim.Framework; 32using OpenSim.Framework;
36using OpenSim.Region.Environment.Scenes.Scripting; 33using OpenSim.Region.Environment.Scenes.Scripting;
37 34
@@ -123,7 +120,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
123 EventQueueThread.Priority = MyThreadPriority; 120 EventQueueThread.Priority = MyThreadPriority;
124 EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount; 121 EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount;
125 EventQueueThread.Start(); 122 EventQueueThread.Start();
126 OpenSim.Framework.ThreadTracker.Add(EventQueueThread); 123 ThreadTracker.Add(EventQueueThread);
127 124
128 // Look at this... Don't you wish everyone did that solid coding everywhere? :P 125 // Look at this... Don't you wish everyone did that solid coding everywhere? :P
129 if (ThreadCount == int.MaxValue) 126 if (ThreadCount == int.MaxValue)
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
index ad41e5b..2bf0e41 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
@@ -27,9 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using System.Threading; 30using System.Threading;
31using OpenSim.Framework;
33 32
34namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 33namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
35{ 34{
@@ -94,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
94 MaintenanceThreadThread.Name = "ScriptMaintenanceThread"; 93 MaintenanceThreadThread.Name = "ScriptMaintenanceThread";
95 MaintenanceThreadThread.IsBackground = true; 94 MaintenanceThreadThread.IsBackground = true;
96 MaintenanceThreadThread.Start(); 95 MaintenanceThreadThread.Start();
97 OpenSim.Framework.ThreadTracker.Add(MaintenanceThreadThread); 96 ThreadTracker.Add(MaintenanceThreadThread);
98 } 97 }
99 } 98 }
100 99
@@ -144,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
144 { 143 {
145 while (true) 144 while (true)
146 { 145 {
147 System.Threading.Thread.Sleep(MaintenanceLoopms); // Sleep before next pass 146 Thread.Sleep(MaintenanceLoopms); // Sleep before next pass
148 147
149 // Reset counters? 148 // Reset counters?
150 if (MaintenanceLoopTicks_ScriptLoadUnload_ResetCount) 149 if (MaintenanceLoopTicks_ScriptLoadUnload_ResetCount)
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
index 02e49a2..a7ad50d 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
@@ -27,13 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.Reflection;
31using log4net;
31using Nini.Config; 32using Nini.Config;
32using OpenSim.Framework.Console;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Environment.Interfaces;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Region.ScriptEngine.Common;
36using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
37 35
38namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 36namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
39{ 37{
@@ -42,9 +40,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
42 /// </summary> 40 /// </summary>
43 /// 41 ///
44 [Serializable] 42 [Serializable]
45 public abstract class ScriptEngine : IRegionModule, OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule 43 public abstract class ScriptEngine : IRegionModule, ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule
46 { 44 {
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 46
49 public static List<ScriptEngine> ScriptEngines = new List<ScriptEngine>(); 47 public static List<ScriptEngine> ScriptEngines = new List<ScriptEngine>();
50 public Scene World; 48 public Scene World;
@@ -75,7 +73,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
75 73
76 public abstract ScriptManager _GetScriptManager(); 74 public abstract ScriptManager _GetScriptManager();
77 75
78 public log4net.ILog Log 76 public ILog Log
79 { 77 {
80 get { return m_log; } 78 get { return m_log; }
81 } 79 }
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
index 09f84d6..cd2e530 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
@@ -32,9 +32,7 @@ using System.Reflection;
32using System.Runtime.Serialization.Formatters.Binary; 32using System.Runtime.Serialization.Formatters.Binary;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using libsecondlife;
35using OpenSim.Framework;
36using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
37using OpenSim.Region.ScriptEngine.Common;
38 36
39namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 37namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
40{ 38{
@@ -106,9 +104,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
106 104
107 #region Object init/shutdown 105 #region Object init/shutdown
108 106
109 public ScriptEngineBase.ScriptEngine m_scriptEngine; 107 public ScriptEngine m_scriptEngine;
110 108
111 public ScriptManager(ScriptEngineBase.ScriptEngine scriptEngine) 109 public ScriptManager(ScriptEngine scriptEngine)
112 { 110 {
113 m_scriptEngine = scriptEngine; 111 m_scriptEngine = scriptEngine;
114 } 112 }
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs
index 4e037b3..768ba6d 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.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.Region.ScriptEngine.Common.ScriptEngineBase 28namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
33{ 29{
34 public interface iScriptEngineFunctionModule 30 public interface iScriptEngineFunctionModule
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs
index 6110251..1119fe8 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs
@@ -28,7 +28,6 @@
28using libsecondlife; 28using libsecondlife;
29using Nini.Config; 29using Nini.Config;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Console;
32using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
33using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; 32using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
34 33
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs
index 6fe6381..14c6078 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.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.Region.ScriptEngine.Common.TRPC 28namespace OpenSim.Region.ScriptEngine.Common.TRPC
33{ 29{
34 class MyBase 30 class MyBase
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs
index 7689d69..624c3bb 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.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.Diagnostics; 29using System.Diagnostics;
31using System.Net; 30using System.Net;
32using System.Net.Sockets; 31using System.Net.Sockets;
33using System.Text;
34 32
35namespace OpenSim.Region.ScriptEngine.Common.TRPC 33namespace OpenSim.Region.ScriptEngine.Common.TRPC
36{ 34{
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs
index 521d75b..ab9d9b4 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs
@@ -25,11 +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.Net;
29
28namespace OpenSim.Region.ScriptEngine.Common.TRPC 30namespace OpenSim.Region.ScriptEngine.Common.TRPC
29{ 31{
30 public class TCPCommon 32 public class TCPCommon
31 { 33 {
32 public delegate void ClientConnectedDelegate(int ID, System.Net.EndPoint Remote); 34 public delegate void ClientConnectedDelegate(int ID, EndPoint Remote);
33 public delegate void DataReceivedDelegate(int ID, byte[] data, int offset, int length); 35 public delegate void DataReceivedDelegate(int ID, byte[] data, int offset, int length);
34 public delegate void DataSentDelegate(int ID, int length); 36 public delegate void DataSentDelegate(int ID, int length);
35 public delegate void CloseDelegate(int ID); 37 public delegate void CloseDelegate(int ID);
@@ -46,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Common.TRPC
46 48
47 public interface ClientInterface : ServerAndClientInterface 49 public interface ClientInterface : ServerAndClientInterface
48 { 50 {
49 event TCPCommon.ConnectErrorDelegate ConnectError; 51 event ConnectErrorDelegate ConnectError;
50 void Connect(string RemoteHost, int RemotePort); 52 void Connect(string RemoteHost, int RemotePort);
51 void Disconnect(int ID); 53 void Disconnect(int ID);
52 } 54 }
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs
index 5d1e53a..55a20e7 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs
@@ -30,7 +30,6 @@ using System.Collections.Generic;
30using System.Diagnostics; 30using System.Diagnostics;
31using System.Net; 31using System.Net;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using TCPCommon=OpenSim.Region.ScriptEngine.Common.TRPC.TCPCommon;
34 33
35namespace OpenSim.Region.ScriptEngine.Common.TRPC 34namespace OpenSim.Region.ScriptEngine.Common.TRPC
36{ 35{
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
index 4567e60..013ae0f 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
@@ -28,7 +28,9 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics; 30using System.Diagnostics;
31using System.Net;
31using System.Text; 32using System.Text;
33using System.Web;
32using libsecondlife; 34using libsecondlife;
33using OpenSim.Region.ScriptEngine.Common.TRPC; 35using OpenSim.Region.ScriptEngine.Common.TRPC;
34 36
@@ -41,24 +43,24 @@ namespace OpenSim.Region.ScriptEngine.Common
41 43
42 public delegate void ReceiveCommandDelegate(int ID, string Command, params object[] p); 44 public delegate void ReceiveCommandDelegate(int ID, string Command, params object[] p);
43 public event ReceiveCommandDelegate ReceiveCommand; 45 public event ReceiveCommandDelegate ReceiveCommand;
44 System.Collections.Generic.Dictionary<string, Type> TypeDictionary = new Dictionary<string, Type>(); 46 Dictionary<string, Type> TypeDictionary = new Dictionary<string, Type>();
45 Type[] Types = 47 Type[] Types =
46 { 48 {
47 typeof(System.String), 49 typeof(String),
48 typeof(System.Int16), 50 typeof(Int16),
49 typeof(System.Int32), 51 typeof(Int32),
50 typeof(System.Int64), 52 typeof(Int64),
51 typeof(System.Double), 53 typeof(Double),
52 typeof(System.Decimal), 54 typeof(Decimal),
53 typeof(System.Array), 55 typeof(Array),
54 typeof(LLUUID), 56 typeof(LLUUID),
55 typeof(System.UInt16), 57 typeof(UInt16),
56 typeof(System.UInt32), 58 typeof(UInt32),
57 typeof(System.UInt64) 59 typeof(UInt64)
58 }; 60 };
59 61
60 // TODO: Maybe we should move queue into TCPSocket so we won't have to keep one queue instance per connection 62 // TODO: Maybe we should move queue into TCPSocket so we won't have to keep one queue instance per connection
61 private System.Collections.Generic.Dictionary<int, InQueueStruct> InQueue = new Dictionary<int, InQueueStruct>(); 63 private Dictionary<int, InQueueStruct> InQueue = new Dictionary<int, InQueueStruct>();
62 private class InQueueStruct 64 private class InQueueStruct
63 { 65 {
64 public byte[] Queue; 66 public byte[] Queue;
@@ -81,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.Common
81 } 83 }
82 } 84 }
83 85
84 void TCPS_ClientConnected(int ID, System.Net.EndPoint Remote) 86 void TCPS_ClientConnected(int ID, EndPoint Remote)
85 { 87 {
86 // Create a incoming queue for this connection 88 // Create a incoming queue for this connection
87 InQueueStruct iq = new InQueueStruct(); 89 InQueueStruct iq = new InQueueStruct();
@@ -165,7 +167,7 @@ namespace OpenSim.Region.ScriptEngine.Common
165 for (int i = 1; i < parts.Length; i++) 167 for (int i = 1; i < parts.Length; i++)
166 { 168 {
167 string[] spl; 169 string[] spl;
168 spl = System.Web.HttpUtility.UrlDecode(parts[i]).Split('|'); 170 spl = HttpUtility.UrlDecode(parts[i]).Split('|');
169 string t = spl[0]; 171 string t = spl[0];
170 param[i - 1] = Convert.ChangeType(spl[1], TypeLookup(t)); 172 param[i - 1] = Convert.ChangeType(spl[1], TypeLookup(t));
171 } 173 }
@@ -192,7 +194,7 @@ namespace OpenSim.Region.ScriptEngine.Common
192 string tmpStr = Command; 194 string tmpStr = Command;
193 for (int i = 0; i < p.Length; i++) 195 for (int i = 0; i < p.Length; i++)
194 { 196 {
195 tmpStr += "," + p[i].GetType().ToString() + "|" + System.Web.HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44") 197 tmpStr += "," + p[i].GetType().ToString() + "|" + HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44")
196 } 198 }
197 tmpStr += "\n"; 199 tmpStr += "\n";
198 byte[] byteData = Encoding.ASCII.GetBytes(tmpStr); 200 byte[] byteData = Encoding.ASCII.GetBytes(tmpStr);
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index e3013c9..fc38ef2 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -30,10 +30,10 @@ using System.CodeDom.Compiler;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Globalization; 31using System.Globalization;
32using System.IO; 32using System.IO;
33using System.Reflection;
34using Microsoft.CSharp; 33using Microsoft.CSharp;
35using Microsoft.VisualBasic;
36using Microsoft.JScript; 34using Microsoft.JScript;
35using Microsoft.VisualBasic;
36using OpenSim.Region.Environment.Interfaces;
37 37
38namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL 38namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
39{ 39{
@@ -62,8 +62,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
62 private bool WriteScriptSourceToDebugFile; 62 private bool WriteScriptSourceToDebugFile;
63 private bool CompileWithDebugInformation; 63 private bool CompileWithDebugInformation;
64 private bool CleanUpOldScriptsOnStartup; 64 private bool CleanUpOldScriptsOnStartup;
65 private System.Collections.Generic.Dictionary<string, Boolean> AllowedCompilers = new Dictionary<string, bool>(StringComparer.CurrentCultureIgnoreCase); 65 private Dictionary<string, bool> AllowedCompilers = new Dictionary<string, bool>(StringComparer.CurrentCultureIgnoreCase);
66 private System.Collections.Generic.Dictionary<string, enumCompileType> LanguageMapping = new Dictionary<string, enumCompileType>(StringComparer.CurrentCultureIgnoreCase); 66 private Dictionary<string, enumCompileType> LanguageMapping = new Dictionary<string, enumCompileType>(StringComparer.CurrentCultureIgnoreCase);
67 67
68 private string FilePrefix; 68 private string FilePrefix;
69 private string ScriptEnginesPath = "ScriptEngines"; 69 private string ScriptEnginesPath = "ScriptEngines";
@@ -276,7 +276,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
276 if (enableCommanderLSL == true && l == enumCompileType.cs) 276 if (enableCommanderLSL == true && l == enumCompileType.cs)
277 { 277 {
278 foreach (KeyValuePair<string, 278 foreach (KeyValuePair<string,
279 OpenSim.Region.Environment.Interfaces.ICommander> com 279 ICommander> com
280 in m_scriptEngine.World.GetCommanders()) 280 in m_scriptEngine.World.GetCommanders())
281 { 281 {
282 compileScript = com.Value.GenerateRuntimeAPI() + compileScript; 282 compileScript = com.Value.GenerateRuntimeAPI() + compileScript;
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 20c108d..0025b26 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -26,9 +26,9 @@
26* 26*
27*/ 27*/
28 28
29using System;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Text.RegularExpressions; 31using System.Text.RegularExpressions;
31using System;
32 32
33namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL 33namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
34{ 34{
@@ -61,7 +61,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
61 public string Convert(string Script) 61 public string Convert(string Script)
62 { 62 {
63 quotes.Clear(); 63 quotes.Clear();
64 string Return = System.String.Empty; 64 string Return = String.Empty;
65 Script = " \r\n" + Script; 65 Script = " \r\n" + Script;
66 66
67 // 67 //
@@ -77,12 +77,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
77 // temporarily replace quotes so we can work our magic on the script without 77 // temporarily replace quotes so we can work our magic on the script without
78 // always considering if we are inside our outside quotes's 78 // always considering if we are inside our outside quotes's
79 // TODO: Does this work on half-quotes in strings? ;) 79 // TODO: Does this work on half-quotes in strings? ;)
80 string _Script = System.String.Empty; 80 string _Script = String.Empty;
81 string C; 81 string C;
82 bool in_quote = false; 82 bool in_quote = false;
83 bool quote_replaced = false; 83 bool quote_replaced = false;
84 string quote_replacement_string = "Q_U_O_T_E_REPLACEMENT_"; 84 string quote_replacement_string = "Q_U_O_T_E_REPLACEMENT_";
85 string quote = System.String.Empty; 85 string quote = String.Empty;
86 bool last_was_escape = false; 86 bool last_was_escape = false;
87 int quote_replaced_count = 0; 87 int quote_replaced_count = 0;
88 for (int p = 0; p < Script.Length; p++) 88 for (int p = 0; p < Script.Length; p++)
@@ -101,7 +101,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
101 } 101 }
102 else 102 else
103 { 103 {
104 if (quote == System.String.Empty) 104 if (quote == String.Empty)
105 { 105 {
106 // We didn't replace quote, probably because of empty string? 106 // We didn't replace quote, probably because of empty string?
107 _Script += quote_replacement_string + 107 _Script += quote_replacement_string +
@@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
111 quotes.Add( 111 quotes.Add(
112 quote_replacement_string + 112 quote_replacement_string +
113 quote_replaced_count.ToString().PadLeft(5, "0".ToCharArray()[0]), quote); 113 quote_replaced_count.ToString().PadLeft(5, "0".ToCharArray()[0]), quote);
114 quote = System.String.Empty; 114 quote = String.Empty;
115 } 115 }
116 break; 116 break;
117 } 117 }
@@ -155,10 +155,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
155 // 155 //
156 int ilevel = 0; 156 int ilevel = 0;
157 int lastlevel = 0; 157 int lastlevel = 0;
158 string ret = System.String.Empty; 158 string ret = String.Empty;
159 string cache = System.String.Empty; 159 string cache = String.Empty;
160 bool in_state = false; 160 bool in_state = false;
161 string current_statename = System.String.Empty; 161 string current_statename = String.Empty;
162 for (int p = 0; p < Script.Length; p++) 162 for (int p = 0; p < Script.Length; p++)
163 { 163 {
164 C = Script.Substring(p, 1); 164 C = Script.Substring(p, 1);
@@ -319,9 +319,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
319 { 319 {
320 state_events.Add(statea, convertnametoFlag(eventa)); 320 state_events.Add(statea, convertnametoFlag(eventa));
321 } 321 }
322 System.Console.WriteLine("State:" + statea + ", event: " + eventa); 322 Console.WriteLine("State:" + statea + ", event: " + eventa);
323 } 323 }
324 System.Console.WriteLine("Matches:" + eventmatches.GetUpperBound(0)); 324 Console.WriteLine("Matches:" + eventmatches.GetUpperBound(0));
325 // Add namespace, class name and inheritance 325 // Add namespace, class name and inheritance
326 326
327 // Looking *ONLY* for state entry events 327 // Looking *ONLY* for state entry events
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 6f2dbad..99efed3 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -28,13 +28,12 @@
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29using System; 29using System;
30using Nini.Config; 30using Nini.Config;
31using OpenSim.Framework.Console;
32using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
33 32
34namespace OpenSim.Region.ScriptEngine.DotNetEngine 33namespace OpenSim.Region.ScriptEngine.DotNetEngine
35{ 34{
36 [Serializable] 35 [Serializable]
37 public class ScriptEngine : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptEngine 36 public class ScriptEngine : Common.ScriptEngineBase.ScriptEngine
38 { 37 {
39 // We need to override a few things for our DotNetEngine 38 // We need to override a few things for our DotNetEngine
40 public override void Initialise(Scene scene, IConfigSource config) 39 public override void Initialise(Scene scene, IConfigSource config)
@@ -43,7 +42,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
43 InitializeEngine(scene, config, true, GetScriptManager()); 42 InitializeEngine(scene, config, true, GetScriptManager());
44 } 43 }
45 44
46 public override OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager _GetScriptManager() 45 public override Common.ScriptEngineBase.ScriptManager _GetScriptManager()
47 { 46 {
48 return new ScriptManager(this); 47 return new ScriptManager(this);
49 } 48 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 05a2d06..e242748 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -34,7 +34,7 @@ using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
34 34
35namespace OpenSim.Region.ScriptEngine.DotNetEngine 35namespace OpenSim.Region.ScriptEngine.DotNetEngine
36{ 36{
37 public class ScriptManager : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager 37 public class ScriptManager : Common.ScriptEngineBase.ScriptManager
38 { 38 {
39 public ScriptManager(Common.ScriptEngineBase.ScriptEngine scriptEngine) 39 public ScriptManager(Common.ScriptEngineBase.ScriptEngine scriptEngine)
40 : base(scriptEngine) 40 : base(scriptEngine)
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
index 54328ff..0208350 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
@@ -33,7 +33,6 @@ using System.Reflection.Emit;
33using System.Text; 33using System.Text;
34using System.Threading; 34using System.Threading;
35using OpenSim.Region.ScriptEngine.Common; 35using OpenSim.Region.ScriptEngine.Common;
36using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
37 36
38namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 37namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
39{ 38{
@@ -59,11 +58,11 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
59 string DLL_FileName = asmName.Name + ".dll"; 58 string DLL_FileName = asmName.Name + ".dll";
60 string DLL_FileName_WithPath = Path.GetDirectoryName(LSO_FileName) + @"\" + DLL_FileName; 59 string DLL_FileName_WithPath = Path.GetDirectoryName(LSO_FileName) + @"\" + DLL_FileName;
61 60
62 LSOEngine.LSO.Common.SendToLog("LSO File Name: " + Path.GetFileName(LSO_FileName)); 61 Common.SendToLog("LSO File Name: " + Path.GetFileName(LSO_FileName));
63 LSOEngine.LSO.Common.SendToLog("Assembly name: " + asmName.Name); 62 Common.SendToLog("Assembly name: " + asmName.Name);
64 LSOEngine.LSO.Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll"); 63 Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll");
65 LSOEngine.LSO.Common.SendToLog("Starting processing of LSL ByteCode..."); 64 Common.SendToLog("Starting processing of LSL ByteCode...");
66 LSOEngine.LSO.Common.SendToLog(String.Empty); 65 Common.SendToLog(String.Empty);
67 66
68 67
69 // Create Assembly 68 // Create Assembly
@@ -104,7 +103,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
104 LSOP.Parse(); 103 LSOP.Parse();
105 104
106 // Constructor has to be created AFTER LSO_Parser because of accumulated variables 105 // Constructor has to be created AFTER LSO_Parser because of accumulated variables
107 if (LSOEngine.LSO.Common.IL_CreateConstructor) 106 if (Common.IL_CreateConstructor)
108 IL_CREATE_CONSTRUCTOR(typeBuilder, LSOP); 107 IL_CREATE_CONSTRUCTOR(typeBuilder, LSOP);
109 108
110 LSOP.CloseFile(); 109 LSOP.CloseFile();
@@ -113,15 +112,15 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
113 */ 112 */
114 113
115 114
116 LSOEngine.LSO.Common.SendToLog("Attempting to compile assembly..."); 115 Common.SendToLog("Attempting to compile assembly...");
117 // Compile it 116 // Compile it
118 Type type = typeBuilder.CreateType(); 117 Type type = typeBuilder.CreateType();
119 LSOEngine.LSO.Common.SendToLog("Compilation successful!"); 118 Common.SendToLog("Compilation successful!");
120 119
121 LSOEngine.LSO.Common.SendToLog("Saving assembly: " + DLL_FileName); 120 Common.SendToLog("Saving assembly: " + DLL_FileName);
122 asmBuilder.Save(DLL_FileName); 121 asmBuilder.Save(DLL_FileName);
123 122
124 LSOEngine.LSO.Common.SendToLog("Returning assembly filename: " + DLL_FileName); 123 Common.SendToLog("Returning assembly filename: " + DLL_FileName);
125 124
126 125
127 return DLL_FileName; 126 return DLL_FileName;
@@ -166,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
166 165
167 private static void IL_CREATE_CONSTRUCTOR(TypeBuilder typeBuilder, LSO_Parser LSOP) 166 private static void IL_CREATE_CONSTRUCTOR(TypeBuilder typeBuilder, LSO_Parser LSOP)
168 { 167 {
169 LSOEngine.LSO.Common.SendToDebug("IL_CREATE_CONSTRUCTOR()"); 168 Common.SendToDebug("IL_CREATE_CONSTRUCTOR()");
170 //ConstructorBuilder constructor = typeBuilder.DefineConstructor( 169 //ConstructorBuilder constructor = typeBuilder.DefineConstructor(
171 // MethodAttributes.Public, 170 // MethodAttributes.Public,
172 // CallingConventions.Standard, 171 // CallingConventions.Standard,
@@ -235,7 +234,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
235 Type datatype = null; 234 Type datatype = null;
236 235
237 // Push data to stack 236 // Push data to stack
238 LSOEngine.LSO.Common.SendToDebug("Adding to static (" + pos + ") type: " + 237 Common.SendToDebug("Adding to static (" + pos + ") type: " +
239 ((LSO_Enums.Variable_Type_Codes) sb.ObjectType).ToString() + " (" + sb.ObjectType + 238 ((LSO_Enums.Variable_Type_Codes) sb.ObjectType).ToString() + " (" + sb.ObjectType +
240 ")"); 239 ")");
241 switch ((LSO_Enums.Variable_Type_Codes) sb.ObjectType) 240 switch ((LSO_Enums.Variable_Type_Codes) sb.ObjectType)
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs
index 60d68f5..6d0e35c 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs
@@ -26,10 +26,6 @@
26 */ 26 */
27 27
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29using System;
30using System.Reflection;
31using System.Reflection.Emit;
32
33namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 29namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
34{ 30{
35 internal partial class LSO_Parser 31 internal partial class LSO_Parser
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs
index ad216aa..1b73311 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.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;
30
31namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 28namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
32{ 29{
33 //public partial class LSL_BaseClass 30 //public partial class LSL_BaseClass
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
index a110c28..e4a57e8 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
@@ -33,7 +33,6 @@ using System.IO;
33using System.Reflection; 33using System.Reflection;
34using System.Reflection.Emit; 34using System.Reflection.Emit;
35using System.Text; 35using System.Text;
36using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
37 36
38namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 37namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
39{ 38{
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
index 3b5ca0f..f035c03 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.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.IO;
31using System.Text;
32using OpenSim.Region.ScriptEngine.LSOEngine.LSO; 28using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
33 29
34namespace OpenSim.Region.ScriptEngine.LSOEngine 30namespace OpenSim.Region.ScriptEngine.LSOEngine
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
index 8495037..3c0e9cd 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
@@ -27,18 +27,12 @@
27 27
28using System; 28using System;
29using Nini.Config; 29using Nini.Config;
30using OpenSim.Framework.Console;
31using OpenSim.Region.Environment.Interfaces;
32using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
33using OpenSim.Region.ScriptEngine.Common;
34using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
35using EventManager = OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.EventManager;
36using ScriptManager=OpenSim.Region.ScriptEngine.LSOEngine.ScriptManager;
37 31
38namespace OpenSim.Region.ScriptEngine.LSOEngine 32namespace OpenSim.Region.ScriptEngine.LSOEngine
39{ 33{
40 [Serializable] 34 [Serializable]
41 public class ScriptEngine : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptEngine 35 public class ScriptEngine : Common.ScriptEngineBase.ScriptEngine
42 { 36 {
43 // We need to override a few things for our DotNetEngine 37 // We need to override a few things for our DotNetEngine
44 public override void Initialise(Scene scene, IConfigSource config) 38 public override void Initialise(Scene scene, IConfigSource config)
@@ -46,7 +40,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
46 InitializeEngine(scene, config, true, GetScriptManager()); 40 InitializeEngine(scene, config, true, GetScriptManager());
47 } 41 }
48 42
49 public override OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager _GetScriptManager() 43 public override Common.ScriptEngineBase.ScriptManager _GetScriptManager()
50 { 44 {
51 return new ScriptManager(this); 45 return new ScriptManager(this);
52 } 46 }
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
index a933b08..0434f55 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
@@ -26,11 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.IO;
31using System.Reflection;
32using System.Runtime.Serialization.Formatters.Binary;
33using System.Threading;
34using libsecondlife; 29using libsecondlife;
35using OpenSim.Framework; 30using OpenSim.Framework;
36using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
@@ -39,7 +34,7 @@ using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
39 34
40namespace OpenSim.Region.ScriptEngine.LSOEngine 35namespace OpenSim.Region.ScriptEngine.LSOEngine
41{ 36{
42 public class ScriptManager : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager 37 public class ScriptManager : Common.ScriptEngineBase.ScriptManager
43 { 38 {
44 public ScriptManager(Common.ScriptEngineBase.ScriptEngine scriptEngine) 39 public ScriptManager(Common.ScriptEngineBase.ScriptEngine scriptEngine)
45 : base(scriptEngine) 40 : base(scriptEngine)
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
index 2a2f24f..603808e 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
@@ -26,8 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Net.Sockets;
30using System.Text;
31using System.Runtime.Remoting; 30using System.Runtime.Remoting;
32using System.Runtime.Remoting.Channels; 31using System.Runtime.Remoting.Channels;
33using System.Runtime.Remoting.Channels.Tcp; 32using System.Runtime.Remoting.Channels.Tcp;
@@ -61,20 +60,20 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
61 // Use the object 60 // Use the object
62 if (obj.Equals(null)) 61 if (obj.Equals(null))
63 { 62 {
64 System.Console.WriteLine("Error: unable to locate server"); 63 Console.WriteLine("Error: unable to locate server");
65 } 64 }
66 else 65 else
67 { 66 {
68 return obj; 67 return obj;
69 } 68 }
70 } 69 }
71 catch (System.Net.Sockets.SocketException) 70 catch (SocketException)
72 { 71 {
73 System.Console.WriteLine("Error: unable to connect to server"); 72 Console.WriteLine("Error: unable to connect to server");
74 } 73 }
75 catch (System.Runtime.Remoting.RemotingException) 74 catch (RemotingException)
76 { 75 {
77 System.Console.WriteLine("Error: unable to connect to server"); 76 Console.WriteLine("Error: unable to connect to server");
78 } 77 }
79 return null; 78 return null;
80 } 79 }
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
index 0995afb..c33cfd1 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
@@ -28,8 +28,9 @@
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29 29
30using System; 30using System;
31using System.Reflection;
32using log4net;
31using Nini.Config; 33using Nini.Config;
32using OpenSim.Framework.Console;
33using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
34using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
35 36
@@ -42,7 +43,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
42 [Serializable] 43 [Serializable]
43 public class ScriptEngine : IRegionModule 44 public class ScriptEngine : IRegionModule
44 { 45 {
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 47
47 internal Scene World; 48 internal Scene World;
48 internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim 49 internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim
@@ -53,7 +54,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
53 Common.mySE = this; 54 Common.mySE = this;
54 } 55 }
55 56
56 public log4net.ILog Log 57 public ILog Log
57 { 58 {
58 get { return m_log; } 59 get { return m_log; }
59 } 60 }
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index 3eaf5aa..72c10f3 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -30,10 +30,11 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.IO; 32using System.IO;
33using System.Reflection;
33using libsecondlife; 34using libsecondlife;
34using OpenSim.Framework; 35using log4net;
35using OpenSim.Framework.Console;
36using OpenSim.Data; 36using OpenSim.Data;
37using OpenSim.Framework;
37using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Environment.Scenes;
39 40
@@ -41,7 +42,7 @@ namespace OpenSim.DataStore.MSSQL
41{ 42{
42 public class MSSQLDataStore : IRegionDataStore 43 public class MSSQLDataStore : IRegionDataStore
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 private const string primSelect = "select * from prims"; 47 private const string primSelect = "select * from prims";
47 private const string shapeSelect = "select * from primshapes"; 48 private const string shapeSelect = "select * from primshapes";
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs
index ba076c2..7162758 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Editing/Flatten.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 libTerrain 28namespace libTerrain
31{ 29{
32 partial class Channel 30 partial class Channel
diff --git a/OpenSim/TestSuite/BotManager.cs b/OpenSim/TestSuite/BotManager.cs
index c867cae..ec71973 100644
--- a/OpenSim/TestSuite/BotManager.cs
+++ b/OpenSim/TestSuite/BotManager.cs
@@ -27,12 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Reflection;
31using System.IO; 31using System.Threading;
32using libsecondlife; 32using libsecondlife;
33using libsecondlife.Packets; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35using System.Threading;
36using OpenSim.Framework; 35using OpenSim.Framework;
37using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
38 37
@@ -43,13 +42,13 @@ namespace OpenSim.TestSuite
43 /// </summary> 42 /// </summary>
44 public class BotManager : conscmd_callback 43 public class BotManager : conscmd_callback
45 { 44 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 46
48 protected ConsoleBase m_console; 47 protected ConsoleBase m_console;
49 protected List<PhysicsBot> m_lBot; 48 protected List<PhysicsBot> m_lBot;
50 protected Thread[] m_td; 49 protected Thread[] m_td;
51 protected bool m_verbose = true; 50 protected bool m_verbose = true;
52 protected Random somthing = new Random(System.Environment.TickCount); 51 protected Random somthing = new Random(Environment.TickCount);
53 protected int numbots = 0; 52 protected int numbots = 0;
54 protected IConfig Previous_config; 53 protected IConfig Previous_config;
55 54
@@ -118,7 +117,7 @@ namespace OpenSim.TestSuite
118 m_td[pos].IsBackground = true; 117 m_td[pos].IsBackground = true;
119 m_td[pos].Start(); 118 m_td[pos].Start();
120 m_lBot.Add(pb); 119 m_lBot.Add(pb);
121 OpenSim.Framework.ThreadTracker.Add(m_td[pos]); 120 ThreadTracker.Add(m_td[pos]);
122 } 121 }
123 122
124 /// <summary> 123 /// <summary>
diff --git a/OpenSim/TestSuite/Main.cs b/OpenSim/TestSuite/Main.cs
index ff4965c..213f02c 100644
--- a/OpenSim/TestSuite/Main.cs
+++ b/OpenSim/TestSuite/Main.cs
@@ -26,15 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife;
32using libsecondlife.Packets;
33using Nini.Config; 29using Nini.Config;
34using log4net;
35using log4net.Config;
36using System.Threading;
37using OpenSim.Framework.Console;
38 30
39namespace OpenSim.TestSuite 31namespace OpenSim.TestSuite
40{ 32{
@@ -89,7 +81,7 @@ namespace OpenSim.TestSuite
89 81
90 private static void Help() 82 private static void Help()
91 { 83 {
92 System.Console.WriteLine( 84 Console.WriteLine(
93 "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + 85 "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" +
94 "Spawns a set of bots to test an OpenSim region\n\n" + 86 "Spawns a set of bots to test an OpenSim region\n\n" +
95 " -l, -loginuri loginuri for sim to log into (required)\n" + 87 " -l, -loginuri loginuri for sim to log into (required)\n" +
diff --git a/OpenSim/TestSuite/PhysicsBot.cs b/OpenSim/TestSuite/PhysicsBot.cs
index 792465f..3d6b54c 100644
--- a/OpenSim/TestSuite/PhysicsBot.cs
+++ b/OpenSim/TestSuite/PhysicsBot.cs
@@ -26,17 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.IO; 29using System.IO;
31using System.Text; 30using System.Threading;
31using System.Timers;
32using libsecondlife; 32using libsecondlife;
33using libsecondlife.Packets;
34using Nini.Config; 33using Nini.Config;
35using System.Threading;
36using OpenSim.Framework; 34using OpenSim.Framework;
37using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
38using Timer = System.Timers.Timer; 36using Timer=System.Timers.Timer;
39using log4net;
40 37
41namespace OpenSim.TestSuite 38namespace OpenSim.TestSuite
42{ 39{
@@ -55,7 +52,7 @@ namespace OpenSim.TestSuite
55 52
56 protected Timer m_action; // Action Timer 53 protected Timer m_action; // Action Timer
57 54
58 protected Random somthing = new Random(System.Environment.TickCount);// We do stuff randomly here 55 protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here
59 56
60 57
61 //New instance of a SecondLife client 58 //New instance of a SecondLife client
@@ -76,7 +73,7 @@ namespace OpenSim.TestSuite
76 //We do our actions here. This is where one would 73 //We do our actions here. This is where one would
77 //add additional steps and/or things the bot should do 74 //add additional steps and/or things the bot should do
78 75
79 void m_action_Elapsed(object sender, System.Timers.ElapsedEventArgs e) 76 void m_action_Elapsed(object sender, ElapsedEventArgs e)
80 { 77 {
81 //client.Throttle.Task = 500000f; 78 //client.Throttle.Task = 500000f;
82 //client.Throttle.Set(); 79 //client.Throttle.Set();
@@ -147,7 +144,7 @@ namespace OpenSim.TestSuite
147 if (OnConnected != null) 144 if (OnConnected != null)
148 { 145 {
149 m_action = new Timer(somthing.Next(1000, 10000)); 146 m_action = new Timer(somthing.Next(1000, 10000));
150 m_action.Elapsed += new System.Timers.ElapsedEventHandler(m_action_Elapsed); 147 m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed);
151 m_action.Start(); 148 m_action.Start();
152 OnConnected(this, EventType.CONNECTED); 149 OnConnected(this, EventType.CONNECTED);
153 client.Self.Jump(); 150 client.Self.Jump();
diff --git a/OpenSim/TestSuite/Util.cs b/OpenSim/TestSuite/Util.cs
index a2b6d1c..c82391b 100644
--- a/OpenSim/TestSuite/Util.cs
+++ b/OpenSim/TestSuite/Util.cs
@@ -59,7 +59,7 @@ namespace OpenSim.TestSuite
59 59
60 private static void TestResult(Result r, String msg) 60 private static void TestResult(Result r, String msg)
61 { 61 {
62 System.Console.WriteLine("[{0}]: {1}", ResultToString(r), msg); 62 Console.WriteLine("[{0}]: {1}", ResultToString(r), msg);
63 } 63 }
64 64
65 public static void TestFail(String msg) 65 public static void TestFail(String msg)
diff --git a/OpenSim/Tests/Common/DoubleToleranceConstraint.cs b/OpenSim/Tests/Common/DoubleToleranceConstraint.cs
index 834d1a3..3363c54 100644
--- a/OpenSim/Tests/Common/DoubleToleranceConstraint.cs
+++ b/OpenSim/Tests/Common/DoubleToleranceConstraint.cs
@@ -27,8 +27,6 @@
27 27
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using NUnit.Framework.Constraints;
31using OpenSim.Tests.Common;
32 30
33namespace OpenSim.Tests.Common 31namespace OpenSim.Tests.Common
34{ 32{
diff --git a/OpenSim/Tests/Common/TestHelper.cs b/OpenSim/Tests/Common/TestHelper.cs
index 83f62e3..6853e55 100644
--- a/OpenSim/Tests/Common/TestHelper.cs
+++ b/OpenSim/Tests/Common/TestHelper.cs
@@ -26,8 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Tests.Common 30namespace OpenSim.Tests.Common
33{ 31{
diff --git a/OpenSim/Tests/OpenSim/Framework/UtilTest.cs b/OpenSim/Tests/OpenSim/Framework/UtilTest.cs
index 39aaa6b..121ee93 100644
--- a/OpenSim/Tests/OpenSim/Framework/UtilTest.cs
+++ b/OpenSim/Tests/OpenSim/Framework/UtilTest.cs
@@ -28,7 +28,6 @@
28using libsecondlife; 28using libsecondlife;
29using NUnit.Framework; 29using NUnit.Framework;
30using NUnit.Framework.SyntaxHelpers; 30using NUnit.Framework.SyntaxHelpers;
31
32using OpenSim.Tests.Common; 31using OpenSim.Tests.Common;
33 32
34namespace OpenSim.Framework.Tests 33namespace OpenSim.Framework.Tests
diff --git a/OpenSim/Tests/UserServer/Stress/UserServerStressTest.cs b/OpenSim/Tests/UserServer/Stress/UserServerStressTest.cs
index e3f8227..711e8b4 100644
--- a/OpenSim/Tests/UserServer/Stress/UserServerStressTest.cs
+++ b/OpenSim/Tests/UserServer/Stress/UserServerStressTest.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using log4net.Config;
29 30
30namespace OpenSim.Tests.UserServer.Stress 31namespace OpenSim.Tests.UserServer.Stress
31{ 32{
@@ -36,9 +37,9 @@ namespace OpenSim.Tests.UserServer.Stress
36 { 37 {
37 public static void Main(string[] args) 38 public static void Main(string[] args)
38 { 39 {
39 log4net.Config.XmlConfigurator.Configure(); 40 XmlConfigurator.Configure();
40 41
41 System.Console.WriteLine("Aborting - not yet functional"); 42 Console.WriteLine("Aborting - not yet functional");
42 } 43 }
43 } 44 }
44} 45}
diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs
index 525f33c..0521df2 100644
--- a/OpenSim/Tools/Export/OpenSimExport.cs
+++ b/OpenSim/Tools/Export/OpenSimExport.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using log4net.Config;
30using Nini.Config; 31using Nini.Config;
31using OpenSim.Framework; 32using OpenSim.Framework;
32using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
@@ -58,7 +59,7 @@ namespace OpenSim.Tools.Export
58 59
59 public static void Main(string[] args) 60 public static void Main(string[] args)
60 { 61 {
61 log4net.Config.XmlConfigurator.Configure(); 62 XmlConfigurator.Configure();
62 63
63 OpenSimExport export = new OpenSimExport(InitConfig(args)); 64 OpenSimExport export = new OpenSimExport(InitConfig(args));
64 RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.xml",false); 65 RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.xml",false);
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index a18fa1b..df06f47 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -27,12 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Reflection;
31using System.IO; 31using System.Threading;
32using libsecondlife; 32using libsecondlife;
33using libsecondlife.Packets; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35using System.Threading;
36using OpenSim.Framework; 35using OpenSim.Framework;
37using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
38 37
@@ -43,13 +42,13 @@ namespace pCampBot
43 /// </summary> 42 /// </summary>
44 public class BotManager : conscmd_callback 43 public class BotManager : conscmd_callback
45 { 44 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 46
48 protected ConsoleBase m_console; 47 protected ConsoleBase m_console;
49 protected List<PhysicsBot> m_lBot; 48 protected List<PhysicsBot> m_lBot;
50 protected Thread[] m_td; 49 protected Thread[] m_td;
51 protected bool m_verbose = true; 50 protected bool m_verbose = true;
52 protected Random somthing = new Random(System.Environment.TickCount); 51 protected Random somthing = new Random(Environment.TickCount);
53 protected int numbots = 0; 52 protected int numbots = 0;
54 protected IConfig Previous_config; 53 protected IConfig Previous_config;
55 54
@@ -117,7 +116,7 @@ namespace pCampBot
117 m_td[pos].IsBackground = true; 116 m_td[pos].IsBackground = true;
118 m_td[pos].Start(); 117 m_td[pos].Start();
119 m_lBot.Add(pb); 118 m_lBot.Add(pb);
120 OpenSim.Framework.ThreadTracker.Add(m_td[pos]); 119 ThreadTracker.Add(m_td[pos]);
121 } 120 }
122 121
123 /// <summary> 122 /// <summary>
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs
index 8495b09..334f699 100644
--- a/OpenSim/Tools/pCampBot/PhysicsBot.cs
+++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs
@@ -26,16 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.IO; 29using System.IO;
31using System.Text; 30using System.Threading;
31using System.Timers;
32using libsecondlife; 32using libsecondlife;
33using libsecondlife.Packets;
34using Nini.Config; 33using Nini.Config;
35using System.Threading;
36using OpenSim.Framework; 34using OpenSim.Framework;
37using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
38using Timer = System.Timers.Timer; 36using Timer=System.Timers.Timer;
39 37
40namespace pCampBot 38namespace pCampBot
41{ 39{
@@ -54,7 +52,7 @@ namespace pCampBot
54 52
55 protected Timer m_action; // Action Timer 53 protected Timer m_action; // Action Timer
56 54
57 protected Random somthing = new Random(System.Environment.TickCount);// We do stuff randomly here 55 protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here
58 56
59 //New instance of a SecondLife client 57 //New instance of a SecondLife client
60 public SecondLife client = new SecondLife(); 58 public SecondLife client = new SecondLife();
@@ -74,7 +72,7 @@ namespace pCampBot
74 //We do our actions here. This is where one would 72 //We do our actions here. This is where one would
75 //add additional steps and/or things the bot should do 73 //add additional steps and/or things the bot should do
76 74
77 void m_action_Elapsed(object sender, System.Timers.ElapsedEventArgs e) 75 void m_action_Elapsed(object sender, ElapsedEventArgs e)
78 { 76 {
79 //client.Throttle.Task = 500000f; 77 //client.Throttle.Task = 500000f;
80 //client.Throttle.Set(); 78 //client.Throttle.Set();
@@ -145,7 +143,7 @@ namespace pCampBot
145 if (OnConnected != null) 143 if (OnConnected != null)
146 { 144 {
147 m_action = new Timer(somthing.Next(1000, 10000)); 145 m_action = new Timer(somthing.Next(1000, 10000));
148 m_action.Elapsed += new System.Timers.ElapsedEventHandler(m_action_Elapsed); 146 m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed);
149 m_action.Start(); 147 m_action.Start();
150 OnConnected(this, EventType.CONNECTED); 148 OnConnected(this, EventType.CONNECTED);
151 client.Self.Jump(); 149 client.Self.Jump();
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index 6daccc4..d944608 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -26,12 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife;
32using libsecondlife.Packets;
33using Nini.Config; 29using Nini.Config;
34using System.Threading;
35using OpenSim.Framework.Console; 30using OpenSim.Framework.Console;
36 31
37namespace pCampBot 32namespace pCampBot
@@ -86,7 +81,7 @@ namespace pCampBot
86 81
87 private static void Help() 82 private static void Help()
88 { 83 {
89 System.Console.WriteLine( 84 Console.WriteLine(
90 "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + 85 "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" +
91 "Spawns a set of bots to test an OpenSim region\n\n" + 86 "Spawns a set of bots to test an OpenSim region\n\n" +
92 " -l, -loginuri loginuri for sim to log into (required)\n" + 87 " -l, -loginuri loginuri for sim to log into (required)\n" +