From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- OpenSim/Region/Application/Application.cs | 69 +- OpenSim/Region/Application/ConfigurationLoader.cs | 24 +- OpenSim/Region/Application/IApplicationPlugin.cs | 2 +- OpenSim/Region/Application/OpenSim.cs | 197 +- OpenSim/Region/Application/OpenSimBase.cs | 185 +- .../Region/Application/Properties/AssemblyInfo.cs | 10 +- .../Region/Application/RegionApplicationBase.cs | 38 +- .../Linden/Caps/AgentPreferencesModule.cs | 2 +- .../Linden/Caps/AvatarPickerSearchModule.cs | 2 +- .../Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 1610 ++++-- .../Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs | 6 +- .../Linden/Caps/BunchOfCaps/MeshCost.cs | 746 +++ .../Linden/Caps/EventQueue/EventQueueGetModule.cs | 521 +- .../Linden/Caps/EventQueue/EventQueueHelper.cs | 110 +- .../Caps/EventQueue/Tests/EventQueueTests.cs | 14 +- .../Linden/Caps/GetDisplayNamesModule.cs | 144 - .../ClientStack/Linden/Caps/GetMeshModule.cs | 329 +- .../ClientStack/Linden/Caps/GetTextureModule.cs | 412 +- .../Linden/Caps/MeshUploadFlagModule.cs | 22 +- .../NewFileAgentInventoryVariablePriceModule.cs | 297 - .../Linden/Caps/ObjectCaps/ObjectAdd.cs | 14 +- .../Caps/ObjectCaps/UploadObjectAssetModule.cs | 18 +- .../Linden/Caps/Properties/AssemblyInfo.cs | 10 +- .../ClientStack/Linden/Caps/RegionConsoleModule.cs | 18 +- .../Linden/Caps/SimulatorFeaturesModule.cs | 17 +- .../Caps/Tests/WebFetchInvDescModuleTests.cs | 4 +- .../Linden/Caps/UploadBakedTextureModule.cs | 203 +- .../Linden/Caps/WebFetchInvDescModule.cs | 101 +- OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | 7 +- .../Region/ClientStack/Linden/UDP/LLClientView.cs | 3447 ++++++----- .../ClientStack/Linden/UDP/LLImageManager.cs | 2 +- .../Region/ClientStack/Linden/UDP/LLUDPClient.cs | 388 +- .../Region/ClientStack/Linden/UDP/LLUDPServer.cs | 778 ++- .../ClientStack/Linden/UDP/LLUDPServerCommands.cs | 87 +- .../ClientStack/Linden/UDP/OpenSimUDPBase.cs | 139 +- .../Region/ClientStack/Linden/UDP/PacketPool.cs | 10 +- .../Linden/UDP/Properties/AssemblyInfo.cs | 10 +- .../Linden/UDP/Tests/BasicCircuitTests.cs | 47 +- .../Linden/UDP/Tests/PacketHandlerTests.cs | 8 +- .../ClientStack/Linden/UDP/Tests/ThrottleTests.cs | 75 +- .../Region/ClientStack/Linden/UDP/ThrottleRates.cs | 27 +- .../Region/ClientStack/Linden/UDP/TokenBucket.cs | 405 +- .../Linden/UDP/UnackedPacketCollection.cs | 21 +- .../Region/ClientStack/Properties/AssemblyInfo.cs | 8 +- .../AssetTransaction/AgentAssetsTransactions.cs | 30 +- .../AssetTransaction/AssetTransactionModule.cs | 12 +- .../Agent/AssetTransaction/AssetXferUploader.cs | 295 +- .../Region/CoreModules/Agent/IPBan/IPBanModule.cs | 8 +- .../Region/CoreModules/Agent/IPBan/SceneBanner.cs | 4 +- .../Agent/TextureSender/J2KDecoderModule.cs | 11 +- .../Region/CoreModules/Agent/Xfer/XferModule.cs | 365 +- .../Region/CoreModules/Asset/CenomeAssetCache.cs | 38 +- OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | 23 +- .../Region/CoreModules/Asset/FlotsamAssetCache.cs | 371 +- .../CoreModules/Asset/GlynnTuckerAssetCache.cs | 24 +- .../Asset/Tests/FlotsamAssetCacheTests.cs | 2 +- .../Avatar/Attachments/AttachmentsModule.cs | 367 +- .../Attachments/Tests/AttachmentsModuleTests.cs | 92 +- .../Avatar/AvatarFactory/AvatarFactoryModule.cs | 616 +- .../Tests/AvatarFactoryModuleTests.cs | 18 +- .../Avatar/BakedTextures/XBakesModule.cs | 97 +- .../Region/CoreModules/Avatar/Chat/ChatModule.cs | 293 +- .../Avatar/Chat/Tests/ChatModuleTests.cs | 67 +- .../CoreModules/Avatar/Combat/CombatModule.cs | 2 - .../Avatar/Commands/UserCommandsModule.cs | 8 +- .../CoreModules/Avatar/Dialog/DialogModule.cs | 6 +- .../Avatar/Friends/CallingCardModule.cs | 5 +- .../CoreModules/Avatar/Friends/FriendsModule.cs | 169 +- .../Avatar/Friends/FriendsRequestHandler.cs | 17 +- .../CoreModules/Avatar/Friends/HGFriendsModule.cs | 58 +- .../CoreModules/Avatar/Friends/HGStatusNotifier.cs | 2 +- .../Avatar/Friends/Tests/FriendModuleTests.cs | 2 +- .../CoreModules/Avatar/Gestures/GesturesModule.cs | 20 +- .../Region/CoreModules/Avatar/Gods/GodsModule.cs | 213 +- .../CoreModules/Avatar/Groups/GroupsModule.cs | 19 +- .../InstantMessage/HGMessageTransferModule.cs | 31 +- .../Avatar/InstantMessage/InstantMessageModule.cs | 69 +- .../Avatar/InstantMessage/MessageTransferModule.cs | 297 +- .../Avatar/InstantMessage/MuteListModule.cs | 4 +- .../Avatar/InstantMessage/MuteListModuleTst.cs | 229 + .../Avatar/InstantMessage/OfflineMessageModule.cs | 132 +- .../Avatar/InstantMessage/XMuteModule.cs | 239 + .../Archiver/InventoryArchiveReadRequest.cs | 297 +- .../Inventory/Archiver/InventoryArchiveUtils.cs | 38 +- .../Archiver/InventoryArchiveWriteRequest.cs | 48 +- .../Inventory/Archiver/InventoryArchiverModule.cs | 217 +- .../Tests/InventoryArchiveLoadPathTests.cs | 120 +- .../Archiver/Tests/InventoryArchiveLoadTests.cs | 84 +- .../Archiver/Tests/InventoryArchiveSaveTests.cs | 60 +- .../Archiver/Tests/InventoryArchiveTestCase.cs | 74 +- .../Inventory/Transfer/InventoryTransferModule.cs | 236 +- .../Transfer/Tests/InventoryTransferModuleTests.cs | 178 +- .../Region/CoreModules/Avatar/Lure/HGLureModule.cs | 6 +- .../Region/CoreModules/Avatar/Lure/LureModule.cs | 30 +- .../Avatar/Profile/BasicProfileModule.cs | 6 +- .../Avatar/UserProfiles/UserProfileModule.cs | 986 +++- .../Framework/Caps/CapabilitiesModule.cs | 150 +- .../Framework/DynamicAttributes/DAExampleModule.cs | 30 +- .../Framework/DynamicAttributes/DOExampleModule.cs | 24 +- .../EntityTransfer/EntityTransferModule.cs | 1709 +++--- .../EntityTransfer/EntityTransferStateMachine.cs | 44 +- .../EntityTransfer/HGEntityTransferModule.cs | 84 +- .../Framework/InterfaceCommander/Commander.cs | 20 +- .../Framework/InventoryAccess/HGAssetMapper.cs | 8 +- .../InventoryAccess/HGInventoryAccessModule.cs | 86 +- .../InventoryAccess/InventoryAccessModule.cs | 557 +- .../InventoryAccess/Tests/HGAssetMapperTests.cs | 9 +- .../Tests/InventoryAccessModuleTests.cs | 64 +- .../CoreModules/Framework/Library/LibraryModule.cs | 6 +- .../Framework/Library/LocalInventoryService.cs | 15 +- .../Framework/Monitoring/MonitorModule.cs | 12 +- .../Framework/Search/BasicSearchModule.cs | 2 +- .../ServiceThrottle/ServiceThrottleModule.cs | 148 +- .../Statistics/Logging/BinaryLoggingModule.cs | 24 +- .../UserManagement/HGUserManagementModule.cs | 14 +- .../Tests/HGUserManagementModuleTests.cs | 2 +- .../UserManagement/UserManagementModule.cs | 345 +- .../CoreModules/Hypergrid/HGWorldMapModule.cs | 8 +- .../Region/CoreModules/Properties/AssemblyInfo.cs | 10 +- .../DynamicTexture/DynamicTextureModule.cs | 147 +- .../Scripting/EMailModules/EmailModule.cs | 31 +- .../Scripting/HttpRequest/ScriptsHttpRequests.cs | 259 +- .../HttpRequest/Tests/ScriptsHttpRequestsTests.cs | 22 +- .../CoreModules/Scripting/LSLHttp/UrlModule.cs | 542 +- .../Scripting/LoadImageURL/LoadImageURLModule.cs | 56 +- .../ScriptModuleComms/ScriptModuleCommsModule.cs | 10 +- .../VectorRender/Tests/VectorRenderModuleTests.cs | 48 +- .../Scripting/VectorRender/VectorRenderModule.cs | 122 +- .../Scripting/WorldComm/WorldCommModule.cs | 124 +- .../CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | 6 +- .../Asset/AssetServiceInConnectorModule.cs | 6 +- .../AuthenticationServiceInConnectorModule.cs | 4 +- .../Grid/GridInfoServiceInConnectorModule.cs | 4 +- .../Hypergrid/HypergridServiceInConnectorModule.cs | 6 +- .../Inventory/InventoryServiceInConnectorModule.cs | 4 +- .../Land/LandServiceInConnectorModule.cs | 33 +- .../Login/LLLoginServiceInConnectorModule.cs | 4 +- .../MapImage/MapImageServiceInConnectorModule.cs | 4 +- .../Neighbour/NeighbourServiceInConnectorModule.cs | 2 +- .../SimulationServiceInConnectorModule.cs | 2 +- .../LocalUserProfilesServiceConnector.cs | 36 +- .../LocalAgentPreferencesServiceConnector.cs | 2 +- .../RemoteAgentPreferencesServiceConnector.cs | 6 +- .../ServiceConnectorsOut/Asset/HGAssetBroker.cs | 73 +- .../Asset/LocalAssetServiceConnector.cs | 44 +- .../Asset/RemoteAssetServiceConnector.cs | 6 +- .../LocalAuthenticationServiceConnector.cs | 11 +- .../RemoteAuthenticationServiceConnector.cs | 2 +- .../LocalAuthorizationServiceConnector.cs | 4 +- .../RemoteAuthorizationServiceConnector.cs | 16 +- .../Avatar/LocalAvatarServiceConnector.cs | 8 +- .../Avatar/RemoteAvatarServiceConnector.cs | 2 +- .../Grid/LocalGridServiceConnector.cs | 164 +- .../ServiceConnectorsOut/Grid/RegionCache.cs | 102 - .../ServiceConnectorsOut/Grid/RegionInfoCache.cs | 965 +++- .../Grid/RemoteGridServiceConnector.cs | 154 +- .../Grid/Tests/GridConnectorsTests.cs | 6 +- .../GridUser/ActivityDetector.cs | 35 +- .../Inventory/HGInventoryBroker.cs | 70 +- .../Inventory/InventoryCache.cs | 13 +- .../Inventory/LocalInventoryServiceConnector.cs | 18 +- .../Inventory/RemoteXInventoryServiceConnector.cs | 16 +- .../Land/LocalLandServiceConnector.cs | 25 +- .../Land/RemoteLandServiceConnector.cs | 2 +- .../MapImage/MapImageServiceModule.cs | 52 +- .../MuteList/LocalMuteListServiceConnector.cs | 188 + .../MuteList/RemoteMuteListServiceConnector.cs | 143 + .../Neighbour/LocalNeighbourServiceConnector.cs | 147 - .../Neighbour/NeighbourServiceOutConnector.cs | 136 + .../Neighbour/RemoteNeighourServiceConnector.cs | 157 - .../Presence/PresenceDetector.cs | 18 +- .../Presence/Tests/PresenceConnectorsTests.cs | 2 +- .../Simulation/LocalSimulationConnector.cs | 10 +- .../Simulation/RemoteSimulationConnector.cs | 17 +- .../LocalUserAccountServiceConnector.cs | 55 +- .../RemoteUserAccountServiceConnector.cs | 61 +- .../UserAccounts/UserAccountCache.cs | 103 +- .../CoreModules/World/Access/AccessModule.cs | 2 +- .../World/Archiver/ArchiveReadRequest.cs | 363 +- .../World/Archiver/ArchiveScenesGroup.cs | 4 +- .../World/Archiver/ArchiveWriteRequest.cs | 122 +- .../CoreModules/World/Archiver/ArchiverModule.cs | 93 +- .../CoreModules/World/Archiver/AssetsArchiver.cs | 11 +- .../CoreModules/World/Archiver/AssetsDearchiver.cs | 1 + .../CoreModules/World/Archiver/AssetsRequest.cs | 232 +- .../World/Archiver/DearchiveScenesGroup.cs | 39 +- .../World/Archiver/Tests/ArchiverTests.cs | 209 +- .../World/Archiver/Tests/Resources/test-sound.wav | Bin .../Region/CoreModules/World/Cloud/CloudModule.cs | 86 +- .../CoreModules/World/Estate/EstateConnector.cs | 228 + .../World/Estate/EstateManagementCommands.cs | 38 +- .../World/Estate/EstateManagementModule.cs | 648 ++- .../CoreModules/World/Estate/EstateModule.cs | 271 + .../World/Estate/EstateRequestHandler.cs | 300 + .../CoreModules/World/Estate/XEstateConnector.cs | 218 - .../CoreModules/World/Estate/XEstateModule.cs | 255 - .../World/Estate/XEstateRequestHandler.cs | 288 - .../Region/CoreModules/World/Land/DwellModule.cs | 27 +- .../Region/CoreModules/World/Land/LandChannel.cs | 62 +- .../CoreModules/World/Land/LandManagementModule.cs | 1333 +++-- .../Region/CoreModules/World/Land/LandObject.cs | 886 ++- .../CoreModules/World/Land/PrimCountModule.cs | 177 +- .../World/Land/Tests/LandManagementModuleTests.cs | 40 +- .../World/Land/Tests/PrimCountModuleTests.cs | 224 +- .../CoreModules/World/LegacyMap/MapImageModule.cs | 23 +- .../World/LegacyMap/ShadedMapTileRenderer.cs | 12 +- .../World/LegacyMap/TexturedMapTileRenderer.cs | 53 +- .../World/LightShare/LightShareModule.cs | 7 +- .../CoreModules/World/Media/Moap/MoapModule.cs | 255 +- .../World/Media/Moap/Tests/MoapTests.cs | 36 +- .../World/Objects/BuySell/BuySellModule.cs | 92 +- .../World/Objects/Commands/ObjectCommandsModule.cs | 120 +- .../World/Permissions/PermissionsModule.cs | 2096 ++++--- .../World/Region/RegionCommandsModule.cs | 91 +- .../CoreModules/World/Region/RestartModule.cs | 186 +- .../World/Serialiser/SerialiseObjects.cs | 2 +- .../World/Serialiser/SerialiserModule.cs | 10 +- .../World/Serialiser/Tests/SerialiserTests.cs | 28 +- .../Region/CoreModules/World/Sound/SoundModule.cs | 174 +- OpenSim/Region/CoreModules/World/Sun/SunModule.cs | 12 +- .../World/Terrain/Effects/ChannelDigger.cs | 4 +- .../World/Terrain/Effects/CookieCutter.cs | 2 +- .../Terrain/Effects/DefaultTerrainGenerator.cs | 2 +- .../CoreModules/World/Terrain/FileLoaders/BMP.cs | 10 +- .../CoreModules/World/Terrain/FileLoaders/GIF.cs | 10 +- .../Terrain/FileLoaders/GenericSystemDrawing.cs | 81 +- .../CoreModules/World/Terrain/FileLoaders/JPEG.cs | 14 +- .../CoreModules/World/Terrain/FileLoaders/LLRAW.cs | 10 +- .../CoreModules/World/Terrain/FileLoaders/PNG.cs | 10 +- .../CoreModules/World/Terrain/FileLoaders/TIFF.cs | 10 +- .../World/Terrain/FloodBrushes/FlattenArea.cs | 11 +- .../World/Terrain/FloodBrushes/LowerArea.cs | 10 +- .../World/Terrain/FloodBrushes/NoiseArea.cs | 13 +- .../World/Terrain/FloodBrushes/RaiseArea.cs | 10 +- .../World/Terrain/FloodBrushes/RevertArea.cs | 10 +- .../World/Terrain/FloodBrushes/SmoothArea.cs | 11 +- .../World/Terrain/ITerrainFloodEffect.cs | 3 +- .../CoreModules/World/Terrain/ITerrainLoader.cs | 2 +- .../World/Terrain/ITerrainPaintableEffect.cs | 3 +- .../World/Terrain/PaintBrushes/ErodeSphere.cs | 29 +- .../World/Terrain/PaintBrushes/FlattenSphere.cs | 9 +- .../World/Terrain/PaintBrushes/LowerSphere.cs | 30 +- .../World/Terrain/PaintBrushes/NoiseSphere.cs | 13 +- .../World/Terrain/PaintBrushes/OlsenSphere.cs | 12 +- .../World/Terrain/PaintBrushes/RaiseSphere.cs | 32 +- .../World/Terrain/PaintBrushes/RevertSphere.cs | 14 +- .../World/Terrain/PaintBrushes/SmoothSphere.cs | 20 +- .../World/Terrain/PaintBrushes/WeatherSphere.cs | 10 +- .../CoreModules/World/Terrain/TerrainModifier.cs | 3 - .../CoreModules/World/Terrain/TerrainModule.cs | 698 ++- .../World/Terrain/Tests/TerrainModuleTests.cs | 4 +- .../CoreModules/World/Terrain/Tests/TerrainTest.cs | 10 +- .../World/Vegetation/VegetationModule.cs | 25 +- .../CoreModules/World/Warp3DMap/TerrainSplat.cs | 12 +- .../World/Warp3DMap/Warp3DImageModule.cs | 239 +- .../World/Wind/Plugins/ConfigurableWind.cs | 19 +- .../World/Wind/Plugins/SimpleRandomWind.cs | 21 +- .../Region/CoreModules/World/Wind/WindModule.cs | 88 +- .../CoreModules/World/WorldMap/MapSearchModule.cs | 167 +- .../CoreModules/World/WorldMap/WorldMapModule.cs | 1579 +++--- .../Interfaces/IAgentAssetTransactions.cs | 4 +- .../Framework/Interfaces/IAttachmentsModule.cs | 15 +- .../Framework/Interfaces/IBakedTextureModule.cs | 5 +- .../Region/Framework/Interfaces/IBuySellModule.cs | 2 +- .../Framework/Interfaces/ICapabilitiesModule.cs | 20 +- .../Region/Framework/Interfaces/ICloudModule.cs | 2 +- OpenSim/Region/Framework/Interfaces/ICommander.cs | 4 +- .../Region/Framework/Interfaces/IDwellModule.cs | 1 + .../Framework/Interfaces/IDynamicFloaterModule.cs | 2 +- .../Framework/Interfaces/IDynamicMenuModule.cs | 1 + .../Framework/Interfaces/IDynamicTextureManager.cs | 26 +- .../Region/Framework/Interfaces/IEntityCreator.cs | 2 +- .../Framework/Interfaces/IEntityInventory.cs | 27 +- .../Framework/Interfaces/IEntityTransferModule.cs | 9 +- .../Region/Framework/Interfaces/IEstateModule.cs | 2 + OpenSim/Region/Framework/Interfaces/IEtcdModule.cs | 37 + OpenSim/Region/Framework/Interfaces/IEventQueue.cs | 22 +- .../Framework/Interfaces/IExternalCapsModule.cs | 2 +- .../Region/Framework/Interfaces/IFriendsModule.cs | 2 + OpenSim/Region/Framework/Interfaces/IGodsModule.cs | 7 +- .../Framework/Interfaces/IGroupsMessagingModule.cs | 12 +- .../Region/Framework/Interfaces/IGroupsModule.cs | 7 +- .../Region/Framework/Interfaces/IHttpRequests.cs | 6 +- .../Framework/Interfaces/IInventoryAccessModule.cs | 17 +- .../Framework/Interfaces/IJsonStoreModule.cs | 6 +- .../Framework/Interfaces/IMapImageUploadModule.cs | 9 +- .../Framework/Interfaces/IMessageTransferModule.cs | 2 +- OpenSim/Region/Framework/Interfaces/IMoapModule.cs | 8 +- OpenSim/Region/Framework/Interfaces/INPCModule.cs | 21 +- .../Framework/Interfaces/IPermissionsModule.cs | 2 +- .../Region/Framework/Interfaces/IPresenceModule.cs | 2 +- .../Framework/Interfaces/IRegionArchiverModule.cs | 28 +- .../Framework/Interfaces/IRegionCombinerModule.cs | 64 - .../Region/Framework/Interfaces/IRegionConsole.cs | 4 + .../Framework/Interfaces/IRegionModuleBase.cs | 2 +- .../Interfaces/IRegionSerialiserModule.cs | 4 +- .../Region/Framework/Interfaces/IRestartModule.cs | 1 + .../Region/Framework/Interfaces/ISearchModule.cs | 2 +- .../Framework/Interfaces/ISimulationDataService.cs | 12 +- .../Framework/Interfaces/ISimulationDataStore.cs | 22 +- OpenSim/Region/Framework/Interfaces/ISnmpModule.cs | 47 + .../Region/Framework/Interfaces/ISoundModule.cs | 2 +- .../Region/Framework/Interfaces/ITerrainChannel.cs | 8 + .../Region/Framework/Interfaces/ITerrainModule.cs | 12 +- OpenSim/Region/Framework/Interfaces/IUrlModule.cs | 7 +- .../Interfaces/IUserAccountCacheModule.cs | 35 + .../Region/Framework/Interfaces/IVoiceModule.cs | 2 +- .../Framework/Interfaces/IWindModelPlugin.cs | 2 +- OpenSim/Region/Framework/Interfaces/IWindModule.cs | 2 +- OpenSim/Region/Framework/Interfaces/IWorldComm.cs | 2 +- .../Region/Framework/Interfaces/IWorldMapModule.cs | 3 +- .../Region/Framework/Properties/AssemblyInfo.cs | 10 +- .../Framework/Scenes/Animation/AnimationSet.cs | 18 +- .../Framework/Scenes/Animation/BinBVHAnimation.cs | 40 +- .../Scenes/Animation/DefaultAvatarAnimations.cs | 6 +- .../Scenes/Animation/MovementAnimationOverrides.cs | 102 + .../Scenes/Animation/ScenePresenceAnimator.cs | 518 +- .../Framework/Scenes/AsyncInventorySender.cs | 9 +- .../Scenes/AsyncSceneObjectGroupDeleter.cs | 38 +- OpenSim/Region/Framework/Scenes/Border.cs | 148 - .../Framework/Scenes/CoalescedSceneObjects.cs | 40 +- OpenSim/Region/Framework/Scenes/CollisionSounds.cs | 342 ++ OpenSim/Region/Framework/Scenes/EntityManager.cs | 4 +- OpenSim/Region/Framework/Scenes/EventManager.cs | 337 +- OpenSim/Region/Framework/Scenes/GodController.cs | 287 + OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 372 +- OpenSim/Region/Framework/Scenes/Prioritizer.cs | 164 +- .../Region/Framework/Scenes/RegionStatsHandler.cs | 8 +- OpenSim/Region/Framework/Scenes/SOPMaterial.cs | 177 + OpenSim/Region/Framework/Scenes/SOPVehicle.cs | 803 +++ OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 948 ++-- .../Framework/Scenes/Scene.PacketHandlers.cs | 291 +- .../Region/Framework/Scenes/Scene.Permissions.cs | 525 +- OpenSim/Region/Framework/Scenes/Scene.cs | 2560 +++++---- OpenSim/Region/Framework/Scenes/SceneBase.cs | 23 +- .../Framework/Scenes/SceneCommunicationService.cs | 59 +- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 833 +-- OpenSim/Region/Framework/Scenes/SceneManager.cs | 256 +- .../Framework/Scenes/SceneObjectGroup.Inventory.cs | 337 +- .../Region/Framework/Scenes/SceneObjectGroup.cs | 3442 ++++++++--- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3024 ++++++---- .../Framework/Scenes/SceneObjectPartInventory.cs | 973 ++-- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5029 +++++++++++------ .../Framework/Scenes/ScenePresenceStateMachine.cs | 6 +- .../CoalescedSceneObjectsSerializer.cs | 30 +- .../Scenes/Serialization/SceneObjectSerializer.cs | 317 +- .../Scenes/Serialization/SceneXmlLoader.cs | 14 +- .../Region/Framework/Scenes/SimStatsReporter.cs | 629 +-- OpenSim/Region/Framework/Scenes/TerrainChannel.cs | 182 +- .../Region/Framework/Scenes/TerrainCompressor.cs | 1611 ++++-- .../Region/Framework/Scenes/Tests/BorderTests.cs | 340 -- .../Framework/Scenes/Tests/EntityManagerTests.cs | 22 +- .../Framework/Scenes/Tests/SceneGraphTests.cs | 20 +- .../Scenes/Tests/SceneObjectBasicTests.cs | 39 +- .../Framework/Scenes/Tests/SceneObjectCopyTests.cs | 34 +- .../Scenes/Tests/SceneObjectCrossingTests.cs | 51 +- .../Scenes/Tests/SceneObjectDeRezTests.cs | 71 +- .../Scenes/Tests/SceneObjectLinkingTests.cs | 56 +- .../Scenes/Tests/SceneObjectResizeTests.cs | 6 +- .../Scenes/Tests/SceneObjectSpatialTests.cs | 3 +- .../Scenes/Tests/SceneObjectStatusTests.cs | 16 +- .../Scenes/Tests/SceneObjectUndoRedoTests.cs | 4 +- .../Scenes/Tests/SceneObjectUserGroupTests.cs | 37 +- .../Scenes/Tests/ScenePresenceAgentTests.cs | 15 +- .../Scenes/Tests/ScenePresenceAnimationTests.cs | 2 +- .../Scenes/Tests/ScenePresenceAutopilotTests.cs | 4 +- .../Scenes/Tests/ScenePresenceCapabilityTests.cs | 8 +- .../Scenes/Tests/ScenePresenceCrossingTests.cs | 8 +- .../Scenes/Tests/ScenePresenceSitTests.cs | 4 +- .../Scenes/Tests/ScenePresenceTeleportTests.cs | 10 +- .../Framework/Scenes/Tests/SceneStatisticsTests.cs | 2 +- .../Framework/Scenes/Tests/SceneTelehubTests.cs | 4 +- .../Region/Framework/Scenes/Tests/SceneTests.cs | 4 +- .../Scenes/Tests/SharedRegionModuleTests.cs | 18 +- .../Framework/Scenes/Tests/TaskInventoryTests.cs | 22 +- .../Framework/Scenes/Tests/UserInventoryTests.cs | 68 +- .../Framework/Scenes/Tests/UuidGathererTests.cs | 18 +- OpenSim/Region/Framework/Scenes/UndoState.cs | 367 +- OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 231 +- .../Server/IRCClientView.cs | 352 +- .../Agent/TextureSender/J2KDecoderCommandModule.cs | 20 +- .../Agent/UDP/Linden/LindenUDPInfoModule.cs | 299 +- .../OptionalModules/Asset/AssetInfoModule.cs | 32 +- .../Avatar/Animations/AnimationsCommandModule.cs | 31 +- .../Avatar/Appearance/AppearanceInfoModule.cs | 42 +- .../Avatar/Attachments/AttachmentsCommandModule.cs | 43 +- .../Avatar/Attachments/TempAttachmentsModule.cs | 29 +- .../OptionalModules/Avatar/Chat/ChannelState.cs | 27 +- .../OptionalModules/Avatar/Chat/IRCBridgeModule.cs | 4 +- .../OptionalModules/Avatar/Chat/IRCConnector.cs | 58 +- .../OptionalModules/Avatar/Chat/RegionState.cs | 43 +- .../Avatar/Concierge/ConciergeModule.cs | 87 +- .../Avatar/Friends/FriendsCommandsModule.cs | 20 +- .../Avatar/SitStand/SitStandCommandsModule.cs | 22 +- .../Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 64 +- .../Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 183 +- .../Avatar/XmlRpcGroups/GroupsMessagingModule.cs | 237 +- .../Avatar/XmlRpcGroups/GroupsModule.cs | 517 +- .../XmlRpcGroups/IGroupsServicesConnector.cs | 7 +- .../SimianGroupsServicesConnectorModule.cs | 95 +- .../Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs | 23 +- .../XmlRpcGroupsServicesConnectorModule.cs | 86 +- .../DataSnapshot/DataSnapshotManager.cs | 5 +- .../OptionalModules/DataSnapshot/LandSnapshot.cs | 13 +- .../OptionalModules/DataSnapshot/ObjectSnapshot.cs | 3 +- .../BareBonesNonShared/BareBonesNonSharedModule.cs | 28 +- .../BareBonesShared/BareBonesSharedModule.cs | 32 +- .../WebSocketEchoTest/WebSocketEchoModule.cs | 10 +- .../Framework/Monitoring/EtcdMonitoringModule.cs | 195 + .../Framework/Monitoring/MonitorServicesModule.cs | 8 +- .../OptionalModules/Materials/MaterialsModule.cs | 453 +- .../PhysicsParameters/PhysicsParameters.cs | 18 +- .../PrimLimitsModule/PrimLimitsModule.cs | 125 +- .../OptionalModules/Properties/AssemblyInfo.cs | 10 +- .../RegionCombinerClientEventForwarder.cs | 94 - .../RegionCombinerIndividualEventForwarder.cs | 139 - .../RegionCombinerLargeLandChannel.cs | 201 - .../RegionCombinerModule/RegionCombinerModule.cs | 880 --- .../RegionCombinerPermissionModule.cs | 270 - .../RegionCombinerModule/RegionConnections.cs | 94 - .../RegionCombinerModule/RegionCourseLocation.cs | 43 - .../RegionCombinerModule/RegionData.cs | 40 - .../Scripting/JsonStore/JsonStore.cs | 130 +- .../Scripting/JsonStore/JsonStoreCommands.cs | 8 +- .../Scripting/JsonStore/JsonStoreModule.cs | 78 +- .../Scripting/JsonStore/JsonStoreScriptModule.cs | 114 +- .../JsonStore/Tests/JsonStoreScriptModuleTests.cs | 80 +- .../Minimodule/Interfaces/IAvatarAttachment.cs | 2 +- .../Minimodule/Interfaces/IInventoryItem.cs | 2 +- .../Scripting/Minimodule/Interfaces/IObject.cs | 16 +- .../Scripting/Minimodule/InventoryItem.cs | 8 +- .../Scripting/Minimodule/MicroScheduler.cs | 2 +- .../Scripting/Minimodule/SOPObject.cs | 28 +- .../Scripting/Minimodule/SOPObjectInventory.cs | 36 +- .../Scripting/Minimodule/SPAvatar.cs | 8 +- .../Scripting/Minimodule/SPAvatarAttachment.cs | 6 +- .../Scripting/Minimodule/Test/TestModule.cs | 4 +- .../OptionalModules/Scripting/Minimodule/World.cs | 6 +- .../RegionReadyModule/RegionReadyModule.cs | 38 +- .../XmlRpcRouterModule/XmlRpcGridRouterModule.cs | 8 +- .../XmlRpcRouterModule/XmlRpcRouterModule.cs | 5 +- .../FreeswitchServiceInConnectorModule.cs | 4 +- .../UserStatistics/Clients_report.cs | 23 +- .../UserStatistics/Default_Report.cs | 19 +- .../OptionalModules/UserStatistics/HTMLUtil.cs | 4 +- .../OptionalModules/UserStatistics/LogLinesAJAX.cs | 12 +- .../UserStatistics/Prototype_distributor.cs | 2 +- .../UserStatistics/Sessions_Report.cs | 11 +- .../OptionalModules/UserStatistics/SimStatsAJAX.cs | 8 +- .../UserStatistics/WebStatsModule.cs | 40 +- .../ViewerSupport/CameraOnlyModeModule.cs | 7 +- .../ViewerSupport/DynamicFloaterModule.cs | 2 +- .../ViewerSupport/DynamicMenuModule.cs | 11 +- .../ViewerSupport/GodNamesModule.cs | 4 +- .../ViewerSupport/SimulatorFeaturesHelper.cs | 102 +- .../ViewerSupport/SpecialUIModule.cs | 5 +- .../World/AutoBackup/AutoBackupModule.cs | 791 +-- .../World/AutoBackup/AutoBackupModuleState.cs | 70 +- .../World/MoneyModule/SampleMoneyModule.cs | 156 +- .../Region/OptionalModules/World/NPC/NPCAvatar.cs | 181 +- .../Region/OptionalModules/World/NPC/NPCModule.cs | 99 +- .../World/NPC/Tests/NPCModuleTests.cs | 8 +- .../World/SceneCommands/SceneCommandsModule.cs | 122 +- .../World/TreePopulator/TreePopulatorModule.cs | 724 ++- .../PhysicsModules/BasicPhysics/AssemblyInfo.cs | 2 +- .../BasicPhysics/BasicPhysicsActor.cs | 19 +- .../BasicPhysics/BasicPhysicsPrim.cs | 19 +- .../BasicPhysics/BasicPhysicsScene.cs | 8 +- .../Region/PhysicsModules/BulletS/BSAPIUnman.cs | 30 +- OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs | 318 +- .../PhysicsModules/BulletS/BSActorAvatarMove.cs | 106 +- .../Region/PhysicsModules/BulletS/BSActorHover.cs | 0 .../PhysicsModules/BulletS/BSActorLockAxis.cs | 0 .../PhysicsModules/BulletS/BSActorMoveToTarget.cs | 4 +- .../PhysicsModules/BulletS/BSActorSetForce.cs | 0 .../PhysicsModules/BulletS/BSActorSetTorque.cs | 2 +- OpenSim/Region/PhysicsModules/BulletS/BSActors.cs | 0 .../Region/PhysicsModules/BulletS/BSApiTemplate.cs | 141 +- .../Region/PhysicsModules/BulletS/BSCharacter.cs | 323 +- .../Region/PhysicsModules/BulletS/BSConstraint.cs | 0 .../PhysicsModules/BulletS/BSConstraint6Dof.cs | 0 .../BulletS/BSConstraintCollection.cs | 0 .../BulletS/BSConstraintConeTwist.cs | 0 .../PhysicsModules/BulletS/BSConstraintHinge.cs | 0 .../PhysicsModules/BulletS/BSConstraintSlider.cs | 0 .../PhysicsModules/BulletS/BSConstraintSpring.cs | 0 .../Region/PhysicsModules/BulletS/BSDynamics.cs | 10 +- OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs | 4 +- .../PhysicsModules/BulletS/BSLinksetCompound.cs | 1 + .../PhysicsModules/BulletS/BSLinksetConstraints.cs | 0 .../Region/PhysicsModules/BulletS/BSMaterials.cs | 0 OpenSim/Region/PhysicsModules/BulletS/BSMotors.cs | 0 OpenSim/Region/PhysicsModules/BulletS/BSParam.cs | 238 +- .../Region/PhysicsModules/BulletS/BSPhysObject.cs | 123 +- OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | 157 +- .../PhysicsModules/BulletS/BSPrimDisplaced.cs | 1 - .../PhysicsModules/BulletS/BSPrimLinkable.cs | 7 +- OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | 329 +- .../PhysicsModules/BulletS/BSShapeCollection.cs | 7 +- OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | 10 +- .../PhysicsModules/BulletS/BSTerrainHeightmap.cs | 24 +- .../PhysicsModules/BulletS/BSTerrainManager.cs | 0 .../Region/PhysicsModules/BulletS/BSTerrainMesh.cs | 0 .../Region/PhysicsModules/BulletS/BulletSimData.cs | 1 + .../PhysicsModules/BulletS/BulletSimTODO.txt | 0 .../PhysicsModules/BulletS/ExtendedPhysics.cs | 2 +- .../BulletS/Properties/AssemblyInfo.cs | 10 +- .../PhysicsModules/BulletS/Tests/BasicVehicles.cs | 0 .../PhysicsModules/BulletS/Tests/BulletSimTests.cs | 112 +- .../BulletS/Tests/BulletSimTestsUtil.cs | 6 +- .../PhysicsModules/BulletS/Tests/HullCreation.cs | 2 +- .../Region/PhysicsModules/BulletS/Tests/Raycast.cs | 124 + .../ConvexDecompositionDotNet/CTri.cs | 26 +- .../ConvexDecompositionDotNet/Concavity.cs | 12 +- .../ConvexDecompositionDotNet/ConvexBuilder.cs | 12 +- .../ConvexDecomposition.cs | 12 +- .../ConvexDecompositionDotNet/ConvexResult.cs | 12 +- .../ConvexDecompositionDotNet/HullClasses.cs | 12 +- .../ConvexDecompositionDotNet/HullTriangle.cs | 12 +- .../ConvexDecompositionDotNet/HullUtils.cs | 79 +- .../ConvexDecompositionDotNet/Plane.cs | 12 +- .../ConvexDecompositionDotNet/PlaneTri.cs | 12 +- .../Properties/AssemblyInfo.cs | 12 +- .../ConvexDecompositionDotNet/Quaternion.cs | 18 +- .../ConvexDecompositionDotNet/SplitPlane.cs | 12 +- .../ConvexDecompositionDotNet/VertexLookup.cs | 12 +- .../ConvexDecompositionDotNet/float2.cs | 12 +- .../ConvexDecompositionDotNet/float3.cs | 12 +- .../ConvexDecompositionDotNet/float3x3.cs | 12 +- .../ConvexDecompositionDotNet/float4.cs | 12 +- .../ConvexDecompositionDotNet/float4x4.cs | 170 +- .../ConvexDecompositionDotNet/int3.cs | 12 +- .../ConvexDecompositionDotNet/int4.cs | 12 +- .../Meshing/Meshmerizer/HelperTypes.cs | 2 +- .../PhysicsModules/Meshing/Meshmerizer/Mesh.cs | 87 +- .../Meshing/Meshmerizer/Meshmerizer.cs | 43 +- .../Meshing/Meshmerizer/PrimMesher.cs | 6 +- .../Meshing/Meshmerizer/SculptMap.cs | 60 +- .../Meshing/Properties/AssemblyInfo.cs | 14 +- .../Region/PhysicsModules/Meshing/ZeroMesher.cs | 25 +- OpenSim/Region/PhysicsModules/Ode/AssemblyInfo.cs | 2 +- OpenSim/Region/PhysicsModules/Ode/ODEApi.cs | 2025 +++++++ OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs | 33 +- OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs | 11 +- OpenSim/Region/PhysicsModules/Ode/ODEModule.cs | 89 + OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs | 720 +-- .../PhysicsModules/Ode/ODERayCastRequestManager.cs | 97 +- .../Region/PhysicsModules/Ode/OdePhysicsJoint.cs | 2 - OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | 980 +--- .../PhysicsModules/Ode/Tests/ODETestClass.cs | 18 +- OpenSim/Region/PhysicsModules/Ode/drawstuff.cs | 98 - OpenSim/Region/PhysicsModules/POS/AssemblyInfo.cs | 2 +- OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | 11 +- OpenSim/Region/PhysicsModules/POS/POSPrim.cs | 5 +- OpenSim/Region/PhysicsModules/POS/POSScene.cs | 8 +- .../PhysicsModules/SharedBase/AssemblyInfo.cs | 2 +- .../Region/PhysicsModules/SharedBase/IMesher.cs | 31 +- .../SharedBase/IPhysicsParameters.cs | 0 .../PhysicsModules/SharedBase/NullPhysicsScene.cs | 2 +- .../PhysicsModules/SharedBase/PhysicsActor.cs | 311 +- .../PhysicsModules/SharedBase/PhysicsScene.cs | 85 +- .../PhysicsModules/SharedBase/PhysicsVector.cs | 2 +- .../PhysicsModules/SharedBase/VehicleConstants.cs | 47 +- OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs | 2024 +++++++ .../Region/PhysicsModules/ubOde/ODECharacter.cs | 2036 +++++++ OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs | 1205 ++++ .../Region/PhysicsModules/ubOde/ODEMeshWorker.cs | 946 ++++ OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs | 112 + OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs | 4256 ++++++++++++++ .../ubOde/ODERayCastRequestManager.cs | 689 +++ OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | 2824 +++++++++ .../Region/PhysicsModules/ubOde/ODESitAvatar.cs | 356 ++ .../ubOde/Properties/AssemblyInfo.cs | 61 + .../PhysicsModules/ubOdeMeshing/HelperTypes.cs | 340 ++ OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs | 636 +++ .../PhysicsModules/ubOdeMeshing/Meshmerizer.cs | 1602 ++++++ .../PhysicsModules/ubOdeMeshing/PrimMesher.cs | 1707 ++++++ .../ubOdeMeshing/Properties/AssemblyInfo.cs | 36 + .../PhysicsModules/ubOdeMeshing/SculptMap.cs | 238 + .../PhysicsModules/ubOdeMeshing/SculptMesh.cs | 220 + .../Region/ScriptEngine/Interfaces/ICompiler.cs | 2 +- .../ScriptEngine/Interfaces/IScriptEngine.cs | 6 +- .../ScriptEngine/Interfaces/IScriptInstance.cs | 6 +- .../Api/Implementation/AsyncCommandManager.cs | 123 +- .../Shared/Api/Implementation/CM_Api.cs | 129 + .../Shared/Api/Implementation/LSL_Api.cs | 5966 ++++++++++++++------ .../Shared/Api/Implementation/LS_Api.cs | 18 +- .../Shared/Api/Implementation/MOD_Api.cs | 84 +- .../Shared/Api/Implementation/OSSL_Api.cs | 2065 +++++-- .../Api/Implementation/Plugins/SensorRepeat.cs | 62 +- .../Shared/Api/Implementation/Plugins/Timer.cs | 34 +- .../Api/Implementation/Properties/AssemblyInfo.cs | 10 +- .../ScriptEngine/Shared/Api/Interface/ICM_Api.cs | 46 + .../ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | 24 +- .../ScriptEngine/Shared/Api/Interface/IMOD_Api.cs | 2 +- .../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 50 +- .../ScriptEngine/Shared/Api/Runtime/CM_Stub.cs | 71 + .../ScriptEngine/Shared/Api/Runtime/Executor.cs | 2 + .../Shared/Api/Runtime/LSL_Constants.cs | 79 +- .../ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 113 +- .../ScriptEngine/Shared/Api/Runtime/LS_Stub.cs | 21 + .../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 173 +- ...nSim.Region.ScriptEngine.Shared.Api.Runtime.mdp | 48 - .../Shared/Api/Runtime/Properties/AssemblyInfo.cs | 8 +- .../ScriptEngine/Shared/Api/Runtime/ScriptBase.cs | 2 + .../Region/ScriptEngine/Shared/AssemblyResolver.cs | 2 +- .../Shared/CodeTools/CSCodeGenerator.cs | 584 +- .../Shared/CodeTools/CSReservedWords.cs | 2 +- .../ScriptEngine/Shared/CodeTools/Compiler.cs | 230 +- .../Shared/CodeTools/ICodeConverter.cs | 3 + .../Shared/CodeTools/LSL2CSCodeTransformer.cs | 2 +- .../Shared/CodeTools/Properties/AssemblyInfo.cs | 10 +- .../Shared/CodeTools/Tests/CSCodeGeneratorTest.cs | 2 +- .../Shared/CodeTools/Tests/CompilerTest.cs | 13 +- .../Shared/CodeTools/Tests/LSL_EventTests.cs | 24 +- .../ScriptEngine/Shared/CodeTools/lsl.lexer.cs | 6 +- .../ScriptEngine/Shared/CodeTools/lsl.parser.cs | 1710 +++--- OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 91 +- .../Shared/Instance/Properties/AssemblyInfo.cs | 10 +- .../ScriptEngine/Shared/Instance/ScriptInstance.cs | 205 +- .../Shared/Instance/ScriptSerializer.cs | 1 + .../Shared/Instance/Tests/CoopTerminationTests.cs | 76 +- OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 172 +- .../ScriptEngine/Shared/Properties/AssemblyInfo.cs | 8 +- .../Shared/Tests/LSL_ApiAvatarTests.cs | 2 + .../ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs | 25 +- .../Shared/Tests/LSL_ApiInventoryTests.cs | 21 +- .../Shared/Tests/LSL_ApiLinkingTests.cs | 4 +- .../ScriptEngine/Shared/Tests/LSL_ApiListTests.cs | 4 +- .../Shared/Tests/LSL_ApiNotecardTests.cs | 8 +- .../Shared/Tests/LSL_ApiObjectTests.cs | 28 +- .../ScriptEngine/Shared/Tests/LSL_ApiTest.cs | 10 +- .../Shared/Tests/LSL_TypesTestLSLFloat.cs | 2 +- .../Shared/Tests/LSL_TypesTestLSLInteger.cs | 2 +- .../Shared/Tests/LSL_TypesTestLSLString.cs | 2 +- .../ScriptEngine/Shared/Tests/LSL_TypesTestList.cs | 2 + .../ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs | 4 +- .../XEngine/Api/Runtime/XEngineScriptBase.cs | 2 +- .../Region/ScriptEngine/XEngine/EventManager.cs | 29 +- .../XEngine/Properties/AssemblyInfo.cs | 10 +- .../XEngine/Tests/XEngineBasicTests.cs | 2 +- .../XEngine/Tests/XEngineCrossingTests.cs | 40 +- .../XEngine/Tests/XEnginePersistenceTests.cs | 2 + OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 236 +- OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs | 2 +- 645 files changed, 76607 insertions(+), 34884 deletions(-) create mode 100644 OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs delete mode 100644 OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs delete mode 100644 OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs create mode 100644 OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModuleTst.cs create mode 100644 OpenSim/Region/CoreModules/Avatar/InstantMessage/XMuteModule.cs delete mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs create mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/MuteList/LocalMuteListServiceConnector.cs create mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/MuteList/RemoteMuteListServiceConnector.cs delete mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs create mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/NeighbourServiceOutConnector.cs delete mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs mode change 100644 => 100755 OpenSim/Region/CoreModules/World/Archiver/Tests/Resources/test-sound.wav create mode 100644 OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs create mode 100644 OpenSim/Region/CoreModules/World/Estate/EstateModule.cs create mode 100644 OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs delete mode 100644 OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs delete mode 100644 OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs delete mode 100644 OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs create mode 100644 OpenSim/Region/Framework/Interfaces/IEtcdModule.cs delete mode 100644 OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs create mode 100644 OpenSim/Region/Framework/Interfaces/ISnmpModule.cs create mode 100644 OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs create mode 100644 OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs delete mode 100644 OpenSim/Region/Framework/Scenes/Border.cs create mode 100644 OpenSim/Region/Framework/Scenes/CollisionSounds.cs create mode 100644 OpenSim/Region/Framework/Scenes/GodController.cs create mode 100644 OpenSim/Region/Framework/Scenes/SOPMaterial.cs create mode 100644 OpenSim/Region/Framework/Scenes/SOPVehicle.cs mode change 100644 => 100755 OpenSim/Region/Framework/Scenes/Scene.cs mode change 100644 => 100755 OpenSim/Region/Framework/Scenes/SceneGraph.cs mode change 100644 => 100755 OpenSim/Region/Framework/Scenes/SimStatsReporter.cs delete mode 100644 OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs create mode 100644 OpenSim/Region/OptionalModules/Framework/Monitoring/EtcdMonitoringModule.cs mode change 100644 => 100755 OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs delete mode 100644 OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerClientEventForwarder.cs delete mode 100644 OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs delete mode 100644 OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerLargeLandChannel.cs delete mode 100644 OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerModule.cs delete mode 100644 OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerPermissionModule.cs delete mode 100644 OpenSim/Region/OptionalModules/RegionCombinerModule/RegionConnections.cs delete mode 100644 OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCourseLocation.cs delete mode 100644 OpenSim/Region/OptionalModules/RegionCombinerModule/RegionData.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSActorHover.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSActorLockAxis.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSActors.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSConstraint.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSConstraint6Dof.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSConstraintCollection.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSConstraintConeTwist.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSConstraintHinge.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSConstraintSlider.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSConstraintSpring.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSLinksetCompound.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSLinksetConstraints.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSMaterials.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSMotors.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSParam.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSTerrainHeightmap.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSTerrainManager.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSTerrainMesh.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BulletSimData.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BulletSimTODO.txt mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/ExtendedPhysics.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/Tests/BasicVehicles.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTests.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs create mode 100755 OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs create mode 100644 OpenSim/Region/PhysicsModules/Ode/ODEApi.cs create mode 100644 OpenSim/Region/PhysicsModules/Ode/ODEModule.cs delete mode 100644 OpenSim/Region/PhysicsModules/Ode/drawstuff.cs mode change 100644 => 100755 OpenSim/Region/PhysicsModules/SharedBase/IPhysicsParameters.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOde/ODERayCastRequestManager.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOde/ODESitAvatar.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOde/Properties/AssemblyInfo.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOdeMeshing/HelperTypes.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOdeMeshing/PrimMesher.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOdeMeshing/Properties/AssemblyInfo.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs create mode 100644 OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMesh.cs create mode 100644 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs create mode 100644 OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs create mode 100644 OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs delete mode 100644 OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp mode change 100644 => 100755 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index bf34419..66ce8e5 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -74,7 +74,16 @@ namespace OpenSim AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); - ServicePointManager.DefaultConnectionLimit = 12; + if(Util.IsWindows()) + ServicePointManager.DefaultConnectionLimit = 32; + else + { + ServicePointManager.DefaultConnectionLimit = 12; + } + + try { ServicePointManager.DnsRefreshTimeout = 300000; } catch { } + ServicePointManager.Expect100Continue = false; + ServicePointManager.UseNagleAlgorithm = false; // Add the arguments supplied when running the application to the configuration ArgvConfigSource configSource = new ArgvConfigSource(args); @@ -85,9 +94,9 @@ namespace OpenSim if (logConfigFile != String.Empty) { XmlConfigurator.Configure(new System.IO.FileInfo(logConfigFile)); - m_log.InfoFormat("[OPENSIM MAIN]: configured log4net using \"{0}\" as configuration file", + m_log.InfoFormat("[OPENSIM MAIN]: configured log4net using \"{0}\" as configuration file", logConfigFile); - } + } else { XmlConfigurator.Configure(); @@ -103,22 +112,22 @@ namespace OpenSim "[OPENSIM MAIN]: Environment variable MONO_THREADS_PER_CPU is {0}", monoThreadsPerCpu ?? "unset"); // Verify the Threadpool allocates or uses enough worker and IO completion threads - // .NET 2.0, workerthreads default to 50 * numcores - // .NET 3.0, workerthreads defaults to 250 * numcores - // .NET 4.0, workerthreads are dynamic based on bitness and OS resources + // .NET 2.0, workerthreads default to 50 * numcores + // .NET 3.0, workerthreads defaults to 250 * numcores + // .NET 4.0, workerthreads are dynamic based on bitness and OS resources // Max IO Completion threads are 1000 on all 3 CLRs // // Mono 2.10.9 to at least Mono 3.1, workerthreads default to 100 * numcores, iocp threads to 4 * numcores - int workerThreadsMin = 500; - int workerThreadsMax = 1000; // may need further adjustment to match other CLR - int iocpThreadsMin = 1000; - int iocpThreadsMax = 2000; // may need further adjustment to match other CLR + int workerThreadsMin = 500; + int workerThreadsMax = 1000; // may need further adjustment to match other CLR + int iocpThreadsMin = 1000; + int iocpThreadsMax = 2000; // may need further adjustment to match other CLR { int currentMinWorkerThreads, currentMinIocpThreads; System.Threading.ThreadPool.GetMinThreads(out currentMinWorkerThreads, out currentMinIocpThreads); m_log.InfoFormat( - "[OPENSIM MAIN]: Runtime gave us {0} min worker threads and {1} min IOCP threads", + "[OPENSIM MAIN]: Runtime gave us {0} min worker threads and {1} min IOCP threads", currentMinWorkerThreads, currentMinIocpThreads); } @@ -137,30 +146,30 @@ namespace OpenSim m_log.InfoFormat("[OPENSIM MAIN]: Limiting max worker threads to {0}",workerThreads); } - // Increase the number of IOCP threads available. - // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17) - if (iocpThreads < iocpThreadsMin) + // Increase the number of IOCP threads available. + // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17) + if (iocpThreads < iocpThreadsMin) { iocpThreads = iocpThreadsMin; m_log.InfoFormat("[OPENSIM MAIN]: Bumping up max IOCP threads to {0}",iocpThreads); } - // Make sure we don't overallocate IOCP threads and thrash system resources + // Make sure we don't overallocate IOCP threads and thrash system resources if ( iocpThreads > iocpThreadsMax ) { iocpThreads = iocpThreadsMax; m_log.InfoFormat("[OPENSIM MAIN]: Limiting max IOCP completion threads to {0}",iocpThreads); } - // set the resulting worker and IO completion thread counts back to ThreadPool + // set the resulting worker and IO completion thread counts back to ThreadPool if ( System.Threading.ThreadPool.SetMaxThreads(workerThreads, iocpThreads) ) - { - m_log.InfoFormat( + { + m_log.InfoFormat( "[OPENSIM MAIN]: Threadpool set to {0} max worker threads and {1} max IOCP threads", workerThreads, iocpThreads); - } - else - { - m_log.Warn("[OPENSIM MAIN]: Threadpool reconfiguration failed, runtime defaults still in effect."); - } + } + else + { + m_log.Warn("[OPENSIM MAIN]: Threadpool reconfiguration failed, runtime defaults still in effect."); + } // Check if the system is compatible with OpenSimulator. // Ensures that the minimum system requirements are met @@ -178,7 +187,7 @@ namespace OpenSim Culture.SetCurrentCulture(); // Validate that the user has the most basic configuration done - // If not, offer to do the most basic configuration for them warning them along the way of the importance of + // If not, offer to do the most basic configuration for them warning them along the way of the importance of // reading these files. /* m_log.Info("Checking for reguired configuration...\n"); @@ -187,13 +196,13 @@ namespace OpenSim || (File.Exists(Path.Combine(Util.configDir(), "opensim.ini"))) || (File.Exists(Path.Combine(Util.configDir(), "openSim.ini"))) || (File.Exists(Path.Combine(Util.configDir(), "Opensim.ini"))); - + bool StanaloneCommon_ProperCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "StandaloneCommon.ini")); bool StanaloneCommon_lowercased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "standalonecommon.ini")); bool GridCommon_ProperCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "GridCommon.ini")); bool GridCommon_lowerCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "gridcommon.ini")); - if ((OpenSim_Ini) + if ((OpenSim_Ini) && ( (StanaloneCommon_ProperCased || StanaloneCommon_lowercased @@ -211,7 +220,7 @@ namespace OpenSim "yes"); if (resp == "yes") { - + if (!(OpenSim_Ini)) { try @@ -311,7 +320,7 @@ namespace OpenSim m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false); // load Crash directory config - m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir); + m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir); if (background) { @@ -319,9 +328,9 @@ namespace OpenSim m_sim.Startup(); } else - { + { m_sim = new OpenSim(configSource); - + m_sim.Startup(); while (true) diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index cf7db97..62bd4f4 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs @@ -43,10 +43,10 @@ namespace OpenSim public class ConfigurationLoader { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - + /// /// Various Config settings the region needs to start - /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor, + /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor, /// StorageDLL, Storage Connection String, Estate connection String, Client Stack /// Standalone settings. /// @@ -154,14 +154,15 @@ namespace OpenSim } // Override distro settings with contents of inidirectory - string iniDirPath = Path.GetFullPath(Path.Combine(Util.configDir(), startupConfig.GetString("inidirectory", "config"))); + string iniDirName = startupConfig.GetString("inidirectory", "config"); + string iniDirPath = Path.Combine(Util.configDir(), iniDirName); if (Directory.Exists(iniDirPath)) { m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath); List overrideSources = new List(); - string[] fileEntries = Directory.GetFiles(iniDirPath); + string[] fileEntries = Directory.GetFiles(iniDirName); foreach (string filePath in fileEntries) { if (Path.GetExtension(filePath).ToLower() == ".ini") @@ -187,7 +188,7 @@ namespace OpenSim { iniFileExists = true; AddIncludes(overrideConfig, overrideSources); - } + } } m_config.Source.Merge(overrideConfig.Source); } @@ -197,7 +198,7 @@ namespace OpenSim { m_log.FatalFormat("[CONFIG]: Could not load any configuration"); Environment.Exit(1); - } + } else if (!iniFileExists) { m_log.FatalFormat("[CONFIG]: Could not load any configuration"); @@ -256,14 +257,14 @@ namespace OpenSim string path = Path.Combine(basepath, chunkWithoutWildcards); path = Path.GetFullPath(path) + chunkWithWildcards; string[] paths = Util.Glob(path); - + // If the include path contains no wildcards, then warn the user that it wasn't found. if (wildcardIndex == -1 && paths.Length == 0) { m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path); } else - { + { foreach (string p in paths) { if (!sources.Contains(p)) @@ -347,13 +348,10 @@ namespace OpenSim config.Set("meshing", "Meshmerizer"); config.Set("physical_prim", true); config.Set("serverside_object_permissions", true); - config.Set("storage_prim_inventories", true); config.Set("startup_console_commands_file", String.Empty); config.Set("shutdown_console_commands_file", String.Empty); config.Set("DefaultScriptEngine", "XEngine"); config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); - // life doesn't really work without this - config.Set("EventQueue", true); } { @@ -379,11 +377,11 @@ namespace OpenSim m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); - m_configSettings.ClientstackDll + m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); } m_networkServersInfo.loadFromConfiguration(m_config.Source); } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs index a3fa66c..ff3f5d7 100644 --- a/OpenSim/Region/Application/IApplicationPlugin.cs +++ b/OpenSim/Region/Application/IApplicationPlugin.cs @@ -43,7 +43,7 @@ namespace OpenSim void Initialise(OpenSimBase openSim); /// - /// Called when the application loading is completed + /// Called when the application loading is completed /// void PostInitialise(); } diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 5af8194..fcc8717 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -26,12 +26,14 @@ */ using System; +using System.Threading; using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; +using System.Runtime; using System.Text; using System.Text.RegularExpressions; using System.Timers; @@ -74,7 +76,7 @@ namespace OpenSim private string m_timedScript = "disabled"; private int m_timeInterval = 1200; - private Timer m_scriptTimer; + private System.Timers.Timer m_scriptTimer; public OpenSim(IConfigSource configSource) : base(configSource) { @@ -114,8 +116,8 @@ namespace OpenSim if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse(asyncCallMethodStr, out asyncCallMethod)) Util.FireAndForgetMethod = asyncCallMethod; - stpMinThreads = startupConfig.GetInt("MinPoolThreads", 15); - stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 300); + stpMinThreads = startupConfig.GetInt("MinPoolThreads", 2 ); + stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 25); m_consolePrompt = startupConfig.GetString("ConsolePrompt", @"Region (\R) "); } @@ -123,8 +125,27 @@ namespace OpenSim Util.InitThreadPool(stpMinThreads, stpMaxThreads); m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod); + + m_log.InfoFormat("[OPENSIM MAIN] Running GC in {0} mode", GCSettings.IsServerGC ? "server":"workstation"); } +#if (_MONO) + private static Mono.Unix.UnixSignal[] signals; + + + private Thread signal_thread = new Thread (delegate () + { + while (true) + { + // Wait for a signal to be delivered + int index = Mono.Unix.UnixSignal.WaitAny (signals, -1); + + //Mono.Unix.Native.Signum signal = signals [index].Signum; + MainConsole.Instance.RunCommand("shutdown"); + } + }); +#endif + /// /// Performs initialisation of the scene, such as loading configuration from disk. /// @@ -134,6 +155,27 @@ namespace OpenSim m_log.Info("========================= STARTING OPENSIM ========================="); m_log.Info("===================================================================="); +#if (_MONO) + if(!Util.IsWindows()) + { + try + { + // linux mac os specifics + signals = new Mono.Unix.UnixSignal[] + { + new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM) + }; + signal_thread.IsBackground = true; + signal_thread.Start(); + } + catch (Exception e) + { + m_log.Info("Could not set up UNIX signal handlers. SIGTERM will not"); + m_log.InfoFormat("shut down gracefully: {0}", e.Message); + m_log.Debug("Exception was: ", e); + } + } +#endif //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); // http://msdn.microsoft.com/en-us/library/bb384202.aspx //GCSettings.LatencyMode = GCLatencyMode.Batch; @@ -172,10 +214,12 @@ namespace OpenSim MainServer.Instance.AddStreamHandler(new OpenSim.XSimStatusHandler(this)); if (userStatsURI != String.Empty) MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this)); + MainServer.Instance.AddStreamHandler(new OpenSim.SimRobotsHandler()); if (managedStatsURI != String.Empty) { string urlBase = String.Format("/{0}/", managedStatsURI); + StatsManager.StatsPassword = managedStatsPassword; MainServer.Instance.AddHTTPHandler(urlBase, StatsManager.HandleStatsRequest); m_log.InfoFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase); } @@ -217,7 +261,7 @@ namespace OpenSim // Start timer script (run a script every xx seconds) if (m_timedScript != "disabled") { - m_scriptTimer = new Timer(); + m_scriptTimer = new System.Timers.Timer(); m_scriptTimer.Enabled = true; m_scriptTimer.Interval = m_timeInterval*1000; m_scriptTimer.Elapsed += RunAutoTimerScript; @@ -238,55 +282,65 @@ namespace OpenSim m_console.Commands.AddCommand("General", false, "change region", "change region ", - "Change current console region", + "Change current console region", ChangeSelectedRegion); m_console.Commands.AddCommand("Archiving", false, "save xml", - "save xml", - "Save a region's data in XML format", + "save xml []", + "Save a region's data in XML format", SaveXml); m_console.Commands.AddCommand("Archiving", false, "save xml2", - "save xml2", - "Save a region's data in XML2 format", + "save xml2 []", + "Save a region's data in XML2 format", SaveXml2); m_console.Commands.AddCommand("Archiving", false, "load xml", - "load xml [-newIDs [ ]]", + "load xml [ [-newUID [ ]]]", "Load a region's data from XML format", LoadXml); m_console.Commands.AddCommand("Archiving", false, "load xml2", - "load xml2", - "Load a region's data from XML2 format", + "load xml2 []", + "Load a region's data from XML2 format", LoadXml2); m_console.Commands.AddCommand("Archiving", false, "save prims xml2", "save prims xml2 [ ]", - "Save named prim to XML2", + "Save named prim to XML2", SavePrimsXml2); m_console.Commands.AddCommand("Archiving", false, "load oar", - "load oar [--merge] [--skip-assets]" + "load oar [-m|--merge] [-s|--skip-assets]" + " [--default-user \"User Name\"]" + " [--force-terrain] [--force-parcels]" + " [--no-objects]" - + " [--rotation degrees] [--rotation-center \"\"]" - + " [--displacement \"\"]" + + " [--rotation degrees]" + + " [--bounding-origin \"\"]" + + " [--bounding-size \"\"]" + + " [--displacement \"\"]" + + " [-d|--debug]" + " []", "Load a region's data from an OAR archive.", "--merge will merge the OAR with the existing scene (suppresses terrain and parcel info loading).\n" + + "--skip-assets will load the OAR but ignore the assets it contains.\n" + "--default-user will use this user for any objects with an owner whose UUID is not found in the grid.\n" - + "--displacement will add this value to the position of every object loaded.\n" + "--force-terrain forces the loading of terrain from the oar (undoes suppression done by --merge).\n" + "--force-parcels forces the loading of parcels from the oar (undoes suppression done by --merge).\n" + "--no-objects suppresses the addition of any objects (good for loading only the terrain).\n" + "--rotation specified rotation to be applied to the oar. Specified in degrees.\n" - + "--rotation-center Location (relative to original OAR) to apply rotation. Default is <128,128,0>.\n" - + "--skip-assets will load the OAR but ignore the assets it contains.\n\n" + + "--bounding-origin will only place objects that after displacement and rotation fall within the bounding cube who's position starts at . Defaults to <0,0,0>.\n" + + "--bounding-size specifies the size of the bounding cube. The default is the size of the destination region and cannot be larger than this.\n" + + "--displacement will add this value to the position of every object loaded.\n" + + "--debug forces the archiver to display messages about where each object is being placed.\n\n" + "The path can be either a filesystem location or a URI.\n" - + " If this is not given then the command looks for an OAR named region.oar in the current directory.", - LoadOar); + + " If this is not given then the command looks for an OAR named region.oar in the current directory." + + " [--rotation-center \"\"] used to be an option, now it does nothing and will be removed soon." + + "When an OAR is being loaded, operations are applied in this order:\n" + + "1: Rotation (around the incoming OARs region center)\n" + + "2: Cropping (a bounding cube with origin and size)\n" + + "3: Displacement (setting offset coordinates within the destination region)", + LoadOar); ; m_console.Commands.AddCommand("Archiving", false, "save oar", //"save oar [-v|--version=] [-p|--profile=] []", @@ -307,12 +361,12 @@ namespace OpenSim m_console.Commands.AddCommand("Objects", false, "edit scale", "edit scale ", - "Change the scale of a named prim", + "Change the scale of a named prim", HandleEditScale); m_console.Commands.AddCommand("Objects", false, "rotate scene", "rotate scene [centerX, centerY]", - "Rotates all scene objects around centerX, centerY (defailt 128, 128) (please back up your region before using)", + "Rotates all scene objects around centerX, centerY (default 128, 128) (please back up your region before using)", HandleRotateScene); m_console.Commands.AddCommand("Objects", false, "scale scene", @@ -334,44 +388,44 @@ namespace OpenSim m_console.Commands.AddCommand("Users", false, "show users", "show users [full]", - "Show user data for users currently on the region", + "Show user data for users currently on the region", "Without the 'full' option, only users actually on the region are shown." + " With the 'full' option child agents of users in neighbouring regions are also shown.", HandleShow); m_console.Commands.AddCommand("Comms", false, "show connections", "show connections", - "Show connection data", + "Show connection data", HandleShow); m_console.Commands.AddCommand("Comms", false, "show circuits", "show circuits", - "Show agent circuit data", + "Show agent circuit data", HandleShow); m_console.Commands.AddCommand("Comms", false, "show pending-objects", "show pending-objects", - "Show # of objects on the pending queues of all scene viewers", + "Show # of objects on the pending queues of all scene viewers", HandleShow); m_console.Commands.AddCommand("General", false, "show modules", "show modules", - "Show module data", + "Show module data", HandleShow); m_console.Commands.AddCommand("Regions", false, "show regions", "show regions", - "Show region data", + "Show region data", HandleShow); - + m_console.Commands.AddCommand("Regions", false, "show ratings", "show ratings", - "Show rating data", + "Show rating data", HandleShow); m_console.Commands.AddCommand("Objects", false, "backup", "backup", - "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", + "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", RunCommand); m_console.Commands.AddCommand("Regions", false, "create region", @@ -385,22 +439,22 @@ namespace OpenSim m_console.Commands.AddCommand("Regions", false, "restart", "restart", - "Restart the currently selected region(s) in this instance", + "Restart the currently selected region(s) in this instance", RunCommand); m_console.Commands.AddCommand("General", false, "command-script", "command-script