From 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Wed, 16 Sep 2009 15:45:40 -0700 Subject: * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity --- .../Region/Examples/SimpleModule/ComplexObject.cs | 2 +- OpenSim/Region/Framework/Scenes/EntityBase.cs | 18 ++++++++----- OpenSim/Region/Framework/Scenes/Scene.cs | 4 +-- .../Region/Framework/Scenes/SceneObjectGroup.cs | 30 +++++++++++++++++----- .../Shared/Api/Implementation/LSL_Api.cs | 8 +++--- OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 12 ++++----- 6 files changed, 46 insertions(+), 28 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs index 3809749..66f4da0 100644 --- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs @@ -68,7 +68,7 @@ namespace OpenSim.Region.Examples.SimpleModule public override void UpdateMovement() { - UpdateGroupRotation(GroupRotation * m_rotationDirection); + UpdateGroupRotation(Rotation * m_rotationDirection); base.UpdateMovement(); } diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs index 00c99c5..3ef4144 100644 --- a/OpenSim/Region/Framework/Scenes/EntityBase.cs +++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs @@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Scenes set { m_velocity = value; } } - protected Quaternion m_rotation = new Quaternion(0f, 0f, 1f, 0f); + protected Quaternion m_rotation; public virtual Quaternion Rotation { @@ -102,6 +102,14 @@ namespace OpenSim.Region.Framework.Scenes set { m_rotation = value; } } + protected Vector3 m_scale; + + public virtual Vector3 Scale + { + get { return m_scale; } + set { m_scale = value; } + } + protected uint m_localId; public virtual uint LocalId @@ -115,13 +123,9 @@ namespace OpenSim.Region.Framework.Scenes /// public EntityBase() { - m_uuid = UUID.Zero; - - m_pos = Vector3.Zero; - m_velocity = Vector3.Zero; - Rotation = Quaternion.Identity; + m_rotation = Quaternion.Identity; + m_scale = Vector3.One; m_name = "(basic entity)"; - m_rotationalvelocity = Vector3.Zero; } /// diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d8478a2..5b3062b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -2296,8 +2296,8 @@ namespace OpenSim.Region.Framework.Scenes "to avatar {0} at position {1}", sp.UUID.ToString(), grp.AbsolutePosition); AttachObject(sp.ControllingClient, - grp.LocalId, (uint)0, - grp.GroupRotation, + grp.LocalId, 0, + grp.Rotation, grp.AbsolutePosition, false); RootPrim.RemFlag(PrimFlags.TemporaryOnRez); grp.SendGroupFullUpdate(); diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 3c17bbe..0cf08b5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -204,9 +204,22 @@ namespace OpenSim.Region.Framework.Scenes get { return m_parts.Count; } } - public Quaternion GroupRotation + public override Quaternion Rotation { get { return m_rootPart.RotationOffset; } + set { m_rootPart.RotationOffset = value; } + } + + public override Vector3 Scale + { + get { return m_rootPart.Scale; } + set { m_rootPart.Scale = value; } + } + + public override Vector3 Velocity + { + get { return m_rootPart.Velocity; } + set { m_rootPart.Velocity = value; } } public UUID GroupID @@ -523,7 +536,7 @@ namespace OpenSim.Region.Framework.Scenes // Temporary commented to stop compiler warning //Vector3 partPosition = // new Vector3(part.AbsolutePosition.X, part.AbsolutePosition.Y, part.AbsolutePosition.Z); - Quaternion parentrotation = GroupRotation; + Quaternion parentrotation = Rotation; // Telling the prim to raytrace. //EntityIntersection inter = part.TestIntersection(hRay, parentrotation); @@ -1866,14 +1879,17 @@ namespace OpenSim.Region.Framework.Scenes checkAtTargets(); - if (UsePhysics && ((Math.Abs(lastPhysGroupRot.W - GroupRotation.W) > 0.1) - || (Math.Abs(lastPhysGroupRot.X - GroupRotation.X) > 0.1) - || (Math.Abs(lastPhysGroupRot.Y - GroupRotation.Y) > 0.1) - || (Math.Abs(lastPhysGroupRot.Z - GroupRotation.Z) > 0.1))) + Quaternion rot = Rotation; + + if (UsePhysics && + ((Math.Abs(lastPhysGroupRot.W - rot.W) > 0.1f) + || (Math.Abs(lastPhysGroupRot.X - rot.X) > 0.1f) + || (Math.Abs(lastPhysGroupRot.Y - rot.Y) > 0.1f) + || (Math.Abs(lastPhysGroupRot.Z - rot.Z) > 0.1f))) { m_rootPart.UpdateFlag = 1; - lastPhysGroupRot = GroupRotation; + lastPhysGroupRot = rot; } foreach (SceneObjectPart part in m_parts.Values) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ba42678..39f620b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -2004,10 +2004,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api q = avatar.Rotation; // Currently infrequently updated so may be inaccurate } else - q = part.ParentGroup.GroupRotation; // Likely never get here but just in case + q = part.ParentGroup.Rotation; // Likely never get here but just in case } else - q = part.ParentGroup.GroupRotation; // just the group rotation + q = part.ParentGroup.Rotation; // just the group rotation return new LSL_Rotation(q.X, q.Y, q.Z, q.W); } q = part.GetWorldRotation(); @@ -7171,10 +7171,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api else q = avatar.Rotation; // Currently infrequently updated so may be inaccurate else - q = m_host.ParentGroup.GroupRotation; // Likely never get here but just in case + q = m_host.ParentGroup.Rotation; // Likely never get here but just in case } else - q = m_host.ParentGroup.GroupRotation; // just the group rotation + q = m_host.ParentGroup.Rotation; // just the group rotation return new LSL_Rotation(q.X, q.Y, q.Z, q.W); } diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index 4855d64..84ccafe 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs @@ -218,16 +218,14 @@ namespace OpenSim.Region.ScriptEngine.Shared } } - Position = new LSL_Types.Vector3(part.AbsolutePosition.X, - part.AbsolutePosition.Y, - part.AbsolutePosition.Z); + Vector3 absPos = part.AbsolutePosition; + Position = new LSL_Types.Vector3(absPos.X, absPos.Y, absPos.Z); - Quaternion wr = part.ParentGroup.GroupRotation; + Quaternion wr = part.ParentGroup.Rotation; Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W); - Velocity = new LSL_Types.Vector3(part.Velocity.X, - part.Velocity.Y, - part.Velocity.Z); + Vector3 vel = part.Velocity; + Velocity = new LSL_Types.Vector3(vel.X, vel.Y, vel.Z); } } -- cgit v1.1 From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 01:00:09 +0900 Subject: Formatting cleanup. --- OpenSim/Region/Application/Application.cs | 2 +- OpenSim/Region/Application/OpenSim.cs | 8 ++-- OpenSim/Region/Application/OpenSimBase.cs | 16 +++---- OpenSim/Region/ClientStack/ClientStackManager.cs | 8 ++-- .../Region/ClientStack/ClientStackUserSettings.cs | 2 +- .../ClientStack/LindenUDP/ILLPacketHandler.cs | 4 +- OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | 4 +- .../Region/ClientStack/LindenUDP/LLClientView.cs | 4 +- .../Region/ClientStack/LindenUDP/LLPacketQueue.cs | 6 +-- .../Region/ClientStack/LindenUDP/LLPacketServer.cs | 6 +-- .../ClientStack/LindenUDP/LLPacketThrottle.cs | 6 +-- .../Region/ClientStack/LindenUDP/LLUDPServer.cs | 38 ++++++++-------- OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs | 2 +- .../LindenUDP/Tests/BasicCircuitTests.cs | 46 ++++++++++---------- .../LindenUDP/Tests/PacketHandlerTests.cs | 12 +++--- .../LindenUDP/Tests/TestLLPacketServer.cs | 4 +- .../ClientStack/LindenUDP/Tests/TestLLUDPServer.cs | 6 +-- .../Region/ClientStack/RegionApplicationBase.cs | 6 +-- OpenSim/Region/ClientStack/ThrottleSettings.cs | 10 ++--- .../Hypergrid/HGCommunicationsGridMode.cs | 4 +- .../Hypergrid/HGCommunicationsStandalone.cs | 8 ++-- .../Communications/Hypergrid/HGUserServices.cs | 2 +- .../Communications/Local/CommunicationsLocal.cs | 8 ++-- .../Communications/Local/LocalUserServices.cs | 4 +- .../Communications/OGS1/CommunicationsOGS1.cs | 2 +- .../Communications/OGS1/OGS1UserDataPlugin.cs | 6 +-- .../Region/Communications/OGS1/OGS1UserServices.cs | 10 ++--- .../AgentAssetTransactionsManager.cs | 2 +- .../Agent/Capabilities/CapabilitiesModule.cs | 10 ++--- .../Region/CoreModules/Agent/IPBan/SceneBanner.cs | 2 +- .../Agent/TextureSender/J2KDecoderModule.cs | 2 +- .../Region/CoreModules/Asset/CenomeAssetCache.cs | 4 +- .../Region/CoreModules/Asset/FlotsamAssetCache.cs | 2 +- .../Region/CoreModules/Avatar/Chat/ChatModule.cs | 2 +- .../CoreModules/Avatar/Dialog/DialogModule.cs | 22 +++++----- .../CoreModules/Avatar/Friends/FriendsModule.cs | 14 +++--- .../CoreModules/Avatar/Gestures/GesturesModule.cs | 2 +- .../Region/CoreModules/Avatar/Gods/GodsModule.cs | 6 +-- .../Avatar/InstantMessage/InstantMessageModule.cs | 2 +- .../Archiver/InventoryArchiveReadRequest.cs | 12 +++--- .../Inventory/Archiver/InventoryArchiveUtils.cs | 12 +++--- .../Archiver/InventoryArchiveWriteRequest.cs | 20 ++++----- .../Inventory/Archiver/InventoryArchiverModule.cs | 46 ++++++++++---------- .../Archiver/Tests/InventoryArchiverTests.cs | 36 ++++++++-------- .../Inventory/Transfer/InventoryTransferModule.cs | 12 +++--- .../Framework/EventQueue/EventQueueGetModule.cs | 2 +- .../InterGrid/OpenGridProtocolModule.cs | 4 +- .../Scripting/VectorRender/VectorRenderModule.cs | 8 ++-- .../LocalAuthorizationServiceConnector.cs | 2 +- .../RemoteAuthorizationServiceConnector.cs | 2 +- .../World/Archiver/ArchiveReadRequest.cs | 8 ++-- .../Archiver/ArchiveWriteRequestPreparation.cs | 6 +-- .../CoreModules/World/Archiver/ArchiverModule.cs | 10 ++--- .../CoreModules/World/Archiver/AssetsArchiver.cs | 2 +- .../CoreModules/World/Archiver/AssetsRequest.cs | 12 +++--- .../World/Archiver/Tests/ArchiverTests.cs | 10 ++--- .../Region/CoreModules/World/Land/LandObject.cs | 4 +- .../Land/RegionCombinerIndividualEventForwarder.cs | 2 +- .../CoreModules/World/Land/RegionCombinerModule.cs | 10 ++--- .../World/Permissions/PermissionsModule.cs | 50 +++++++++++----------- .../World/Serialiser/SerialiserModule.cs | 2 +- .../World/Serialiser/Tests/SerialiserTests.cs | 16 +++---- .../Region/CoreModules/World/Sound/SoundModule.cs | 12 +++--- OpenSim/Region/CoreModules/World/Sun/SunModule.cs | 4 +- .../World/Vegetation/VegetationModule.cs | 6 +-- .../World/Wind/Plugins/ConfigurableWind.cs | 2 +- .../World/Wind/Plugins/SimpleRandomWind.cs | 2 +- .../Region/CoreModules/World/Wind/WindModule.cs | 2 +- OpenSim/Region/DataSnapshot/EstateSnapshot.cs | 2 +- .../Region/Examples/SimpleModule/MyNpcCharacter.cs | 2 +- .../Interfaces/IAgentAssetTransactions.cs | 2 +- OpenSim/Region/Framework/Interfaces/ICommander.cs | 4 +- .../Region/Framework/Interfaces/IDialogModule.cs | 10 ++--- .../Region/Framework/Interfaces/IEntityCreator.cs | 8 ++-- .../Framework/Interfaces/IEntityInventory.cs | 6 +-- .../Region/Framework/Interfaces/IFriendsModule.cs | 6 +-- OpenSim/Region/Framework/Interfaces/IGodsModule.cs | 4 +- .../Interfaces/IInventoryArchiverModule.cs | 8 ++-- .../Region/Framework/Interfaces/ILandChannel.cs | 4 +- .../Framework/Interfaces/IRegionArchiverModule.cs | 8 ++-- .../Framework/Interfaces/IRegionDataStore.cs | 8 ++-- .../Interfaces/IRegionSerialiserModule.cs | 2 +- .../Region/Framework/Interfaces/ISoundModule.cs | 4 +- .../Framework/Interfaces/IVegetationModule.cs | 4 +- .../Region/Framework/Interfaces/IWorldMapModule.cs | 4 +- .../Scenes/AsyncSceneObjectGroupDeleter.cs | 22 +++++----- .../Region/Framework/Scenes/AvatarAnimations.cs | 2 +- OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs | 6 +-- OpenSim/Region/Framework/Scenes/EntityManager.cs | 2 +- OpenSim/Region/Framework/Scenes/EventManager.cs | 4 +- .../Hypergrid/HGSceneCommunicationService.cs | 2 +- .../Region/Framework/Scenes/RegionStatsHandler.cs | 6 +-- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 +- .../Framework/Scenes/Scene.PacketHandlers.cs | 14 +++--- .../Region/Framework/Scenes/Scene.Permissions.cs | 16 +++---- OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++-- OpenSim/Region/Framework/Scenes/SceneBase.cs | 8 ++-- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 +- OpenSim/Region/Framework/Scenes/SceneManager.cs | 12 +++--- .../Region/Framework/Scenes/SceneObjectGroup.cs | 24 +++++------ OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 18 ++++---- .../Framework/Scenes/SceneObjectPartInventory.cs | 4 +- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 14 +++--- .../Scenes/Serialization/SceneObjectSerializer.cs | 16 +++---- .../Scenes/Serialization/SceneXmlLoader.cs | 2 +- .../Region/Framework/Scenes/SimStatsReporter.cs | 2 +- .../Framework/Scenes/Tests/EntityManagerTests.cs | 14 +++--- .../Scenes/Tests/SceneObjectBasicTests.cs | 16 +++---- .../Scenes/Tests/SceneObjectLinkingTests.cs | 12 +++--- .../Region/Framework/Scenes/Tests/SceneTests.cs | 4 +- .../Scenes/Tests/StandaloneTeleportTests.cs | 4 +- OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 12 +++--- .../Server/IRCClientView.cs | 2 +- .../OptionalModules/Avatar/Chat/RegionState.cs | 2 +- .../Voice/FreeSwitchVoice/FreeSwitchDialplan.cs | 4 +- .../Voice/FreeSwitchVoice/FreeSwitchDirectory.cs | 18 ++++---- .../Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 4 +- .../Avatar/XmlRpcGroups/GroupsModule.cs | 2 +- .../ContentManagementSystem/CMController.cs | 2 +- .../ContentManagementSystem/CMModel.cs | 2 +- .../Scripting/Minimodule/MRMModule.cs | 2 +- .../SvnSerialiser/SvnBackupModule.cs | 2 +- .../BulletDotNETPlugin/BulletDotNETScene.cs | 4 +- .../Region/Physics/Manager/PhysicsPluginManager.cs | 2 +- OpenSim/Region/Physics/Manager/VehicleConstants.cs | 2 +- .../Physics/OdePlugin/ODERayCastRequestManager.cs | 2 +- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 10 ++--- .../DotNetEngine/EventQueueThreadClass.cs | 2 +- .../ScriptEngine/DotNetEngine/ScriptEngine.cs | 6 +-- .../ScriptEngine/DotNetEngine/ScriptManager.cs | 4 +- .../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 4 +- .../ScriptEngine/Shared/Instance/ScriptInstance.cs | 8 ++-- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 8 ++-- OpenSim/Region/UserStatistics/WebStatsModule.cs | 4 +- 134 files changed, 525 insertions(+), 525 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 2fd26bf..241af53 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -91,7 +91,7 @@ namespace OpenSim m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config"); } - // Check if the system is compatible with OpenSimulator. + // Check if the system is compatible with OpenSimulator. // Ensures that the minimum system requirements are met m_log.Info("Performing compatibility checks... "); string supported = String.Empty; diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index d7a4944..f070812 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -1245,20 +1245,20 @@ namespace OpenSim protected void LoadOar(string module, string[] cmdparams) { try - { + { if (cmdparams.Length > 2) { - m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); + m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); } else { - m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME); + m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME); } } catch (Exception e) { m_log.Error(e.Message); - } + } } /// diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 821de35..468c5d7 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -98,7 +98,7 @@ namespace OpenSim /// /// The config information passed into the OpenSimulator region server. - /// + /// public OpenSimConfigSource ConfigSource { get { return m_config; } @@ -383,14 +383,14 @@ namespace OpenSim scene.SetModuleInterfaces(); - // Prims have to be loaded after module configuration since some modules may be invoked during the load + // Prims have to be loaded after module configuration since some modules may be invoked during the load scene.LoadPrimsFromStorage(regionInfo.originRegionID); // moved these here as the terrain texture has to be created after the modules are initialized // and has to happen before the region is registered with the grid. scene.CreateTerrainTexture(false); - // TODO : Try setting resource for region xstats here on scene + // TODO : Try setting resource for region xstats here on scene MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); try @@ -507,7 +507,7 @@ namespace OpenSim /// Remove a region from the simulator without deleting it permanently. /// /// - /// + /// public void CloseRegion(Scene scene) { // only need to check this if we are not at the @@ -526,7 +526,7 @@ namespace OpenSim /// Remove a region from the simulator without deleting it permanently. /// /// - /// + /// public void CloseRegion(string name) { Scene target; @@ -539,7 +539,7 @@ namespace OpenSim /// /// /// - /// + /// protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer) { return SetupScene(regionInfo, 0, null, out clientServer); @@ -750,7 +750,7 @@ namespace OpenSim } public string Path - { + { // This is for the OpenSimulator instance and is the osSecret hashed get { return "/" + osXStatsURI + "/"; } } @@ -791,7 +791,7 @@ namespace OpenSim } public string Path - { + { // This is for the OpenSimulator instance and is the user provided URI get { return "/" + osUXStatsURI + "/"; } } diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs index 5667d64..84ea0b3 100644 --- a/OpenSim/Region/ClientStack/ClientStackManager.cs +++ b/OpenSim/Region/ClientStack/ClientStackManager.cs @@ -87,9 +87,9 @@ namespace OpenSim.Region.ClientStack public IClientNetworkServer CreateServer( IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, AgentCircuitManager authenticateClass) - { + { return CreateServer( - _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, authenticateClass); + _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, authenticateClass); } /// @@ -104,11 +104,11 @@ namespace OpenSim.Region.ClientStack /// /// /// - /// + /// public IClientNetworkServer CreateServer( IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager authenticateClass) - { + { if (plugin != null) { IClientNetworkServer server = diff --git a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs index a3c23cc..231b3aa 100644 --- a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs +++ b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs @@ -32,7 +32,7 @@ namespace OpenSim.Region.ClientStack /// /// At the moment this is very incomplete - other tweakable settings could be added. This is also somewhat LL client /// oriented right now. - /// + /// public class ClientStackUserSettings { /// diff --git a/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs index 665c773..32a4ad4 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs @@ -31,7 +31,7 @@ using OpenMetaverse.Packets; using OpenSim.Framework; namespace OpenSim.Region.ClientStack.LindenUDP -{ +{ public delegate void PacketStats(int inPackets, int outPackets, int unAckedBytes); public delegate void PacketDrop(Packet pack, Object id); public delegate bool SynchronizeClientHandler(IScene scene, Packet packet, UUID agentID, ThrottleOutPacketType throttlePacketType); @@ -61,7 +61,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// Take action depending on the type and contents of an received packet. /// - /// + /// void ProcessInPacket(LLQueItem item); void ProcessOutPacket(LLQueItem item); diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs index 6cffd70..638c765 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs @@ -127,7 +127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } else { - m_asset = asset; + m_asset = asset; } RunUpdate(); } @@ -198,7 +198,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP try { Buffer.BlockCopy(m_asset.Data, 0, firstImageData, 0, (int)cFirstPacketSize); - client.SendImageFirstPart(TexturePacketCount(), m_requestedUUID, (uint)m_asset.Data.Length, firstImageData, 2); + client.SendImageFirstPart(TexturePacketCount(), m_requestedUUID, (uint)m_asset.Data.Length, firstImageData, 2); } catch (Exception) { diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 912cbf1..88ace6a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -2332,7 +2332,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return itemBlock; } - public void SendBulkUpdateInventory(InventoryNodeBase node) + public void SendBulkUpdateInventory(InventoryNodeBase node) { if (node is InventoryItemBase) SendBulkUpdateInventoryItem((InventoryItemBase)node); @@ -2937,7 +2937,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP else if (m_avatarTerseUpdates.Count == 1) { lock (m_avatarTerseUpdateTimer) - m_avatarTerseUpdateTimer.Start(); + m_avatarTerseUpdateTimer.Start(); } } } diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index 798c1e7..c427870 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs @@ -143,7 +143,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP TextureThrottle = new LLPacketThrottle(1000, throttleMaxBPS / 2, 4000, userSettings.ClientThrottleMultipler); - // Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second. + // Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second. ThrottleSettings totalThrottleSettings = userSettings.TotalThrottleSettings; @@ -410,7 +410,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue(); - SendQueue.Enqueue(qpack); + SendQueue.Enqueue(qpack); TotalThrottle.AddBytes(qpack.Length); ResendThrottle.AddBytes(qpack.Length); @@ -470,7 +470,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue(); - SendQueue.Enqueue(qpack); + SendQueue.Enqueue(qpack); TotalThrottle.AddBytes(qpack.Length); TextureThrottle.AddBytes(qpack.Length); qchanged = true; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs index 56219d1..0f16fd4 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs @@ -48,11 +48,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// Tweakable user settings /// - private ClientStackUserSettings m_userSettings; + private ClientStackUserSettings m_userSettings; public LLPacketServer(ILLClientStackNetworkHandler networkHandler, ClientStackUserSettings userSettings) { - m_userSettings = userSettings; + m_userSettings = userSettings; m_networkHandler = networkHandler; m_networkHandler.RegisterPacketServer(this); @@ -129,7 +129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// /// true if a new circuit was created, false if a circuit with the given circuit code already existed - /// + /// public virtual bool AddNewClient( EndPoint epSender, UseCircuitCodePacket useCircuit, AuthenticateResponse sessionInfo, EndPoint proxyEP) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs index 01bff6d..26174e5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs @@ -26,7 +26,7 @@ */ namespace OpenSim.Region.ClientStack.LindenUDP -{ +{ public class LLPacketThrottle { private readonly int m_maxAllowableThrottle; @@ -105,13 +105,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP public int Throttle { - get { return m_currentThrottle; } + get { return m_currentThrottle; } set { if (value < m_minAllowableThrottle) { m_currentThrottle = m_minAllowableThrottle; - } + } else if (value > m_maxAllowableThrottle) { m_currentThrottle = m_maxAllowableThrottle; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 9ee8df5..c779b08 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -166,7 +166,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP userSettings.ClientThrottleMultipler = config.GetFloat("client_throttle_multiplier"); if (config.Contains("client_socket_rcvbuf_size")) m_clientSocketReceiveBuffer = config.GetInt("client_socket_rcvbuf_size"); - } + } m_log.DebugFormat("[CLIENT]: client_throttle_multiplier = {0}", userSettings.ClientThrottleMultipler); m_log.DebugFormat("[CLIENT]: client_socket_rcvbuf_size = {0}", (m_clientSocketReceiveBuffer != 0 ? @@ -228,7 +228,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { m_log.Debug("[CLIENT]: " + e); } - } + } if (proxyPortOffset != 0) @@ -254,7 +254,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (packet != null) { if (packet.Type == PacketType.UseCircuitCode) - AddNewClient((UseCircuitCodePacket)packet, epSender, epProxy); + AddNewClient((UseCircuitCodePacket)packet, epSender, epProxy); else ProcessInPacket(packet, epSender); } @@ -290,7 +290,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP catch (Exception e) { m_log.Error("[CLIENT]: Exception in processing packet - ignoring: ", e); - } + } } /// @@ -299,7 +299,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected virtual void BeginReceive() { m_socket.BeginReceiveFrom( - RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref reusedEpSender, ReceivedData, null); + RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref reusedEpSender, ReceivedData, null); } /// @@ -322,7 +322,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // ENDLESS LOOP ON PURPOSE! // Reset connection and get next UDP packet off the buffer // If the UDP packet is part of the same stream, this will happen several hundreds of times before - // the next set of UDP data is for a valid client. + // the next set of UDP data is for a valid client. try { @@ -347,7 +347,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_log.ErrorFormat("[CLIENT]: Exception thrown during BeginReceive(): {0}", ex); } } - } + } /// /// Close a client circuit. This is done in response to an exception on receive, and should not be called @@ -363,12 +363,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP { m_packetServer.CloseCircuit(circuit); - if (e != null) + if (e != null) m_log.ErrorFormat( - "[CLIENT]: Closed circuit {0} {1} due to exception {2}", circuit, reusedEpSender, e); + "[CLIENT]: Closed circuit {0} {1} due to exception {2}", circuit, reusedEpSender, e); } } - } + } /// /// Finish the process of asynchronously receiving the next bit of raw data @@ -410,7 +410,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { m_log.DebugFormat("[CLIENT]: ObjectDisposedException: Object {0} disposed.", e.ObjectName); // Uhh, what object, and why? this needs better handling. - } + } return hasReceivedOkay; } @@ -422,10 +422,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy) - { + { //Slave regions don't accept new clients if (m_localScene.RegionStatus != RegionStatus.SlaveScene) - { + { AuthenticateResponse sessionInfo; bool isNewCircuit = false; @@ -441,8 +441,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP lock (clientCircuits) { if (!clientCircuits.ContainsKey(epSender)) - { - clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); + { + clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); isNewCircuit = true; } } @@ -461,9 +461,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP //m_log.DebugFormat( // "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", - // useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName); - } - } + // useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName); + } + } // Ack the UseCircuitCode packet PacketAckPacket ack_it = (PacketAckPacket)PacketPool.Instance.GetPacket(PacketType.PacketAck); @@ -605,7 +605,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code); return; - } + } lock (clientCircuits) { diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs index f2a8bd2..c45d11f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs @@ -28,7 +28,7 @@ using OpenMetaverse; namespace OpenSim.Region.ClientStack.LindenUDP -{ +{ public class LLUtil { /// diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs index 9fb1041..32c0397 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs @@ -54,7 +54,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests catch { // I don't care, just leave log4net off - } + } } /// @@ -63,20 +63,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests /// /// /// - /// Agent circuit manager used in setting up the stack + /// Agent circuit manager used in setting up the stack protected void SetupStack( IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer, out AgentCircuitManager acm) { IConfigSource configSource = new IniConfigSource(); ClientStackUserSettings userSettings = new ClientStackUserSettings(); - testLLUDPServer = new TestLLUDPServer(); + testLLUDPServer = new TestLLUDPServer(); acm = new AgentCircuitManager(); - uint port = 666; + uint port = 666; testLLUDPServer.Initialise(null, ref port, 0, false, configSource, acm); testPacketServer = new TestLLPacketServer(testLLUDPServer, userSettings); - testLLUDPServer.LocalScene = scene; + testLLUDPServer.LocalScene = scene; } /// @@ -124,7 +124,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests acm.AddNewCircuit(circuitCode, acd); - testLLUDPServer.LoadReceive(uccp, epSender); + testLLUDPServer.LoadReceive(uccp, epSender); testLLUDPServer.ReceiveData(null); } @@ -142,15 +142,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb }; onp.Header.Zerocoded = false; - return onp; + return onp; } /// /// Test adding a client to the stack /// - [Test, LongRunning] + [Test, LongRunning] public void TestAddClient() - { + { TestHelper.InMethod(); uint myCircuitCode = 123456; @@ -177,7 +177,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 999); - testLLUDPServer.LoadReceive(uccp, testEp); + testLLUDPServer.LoadReceive(uccp, testEp); testLLUDPServer.ReceiveData(null); // Circuit shouildn't exist since the circuit manager doesn't know about this circuit for authentication yet @@ -185,8 +185,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests acm.AddNewCircuit(myCircuitCode, acd); - testLLUDPServer.LoadReceive(uccp, testEp); - testLLUDPServer.ReceiveData(null); + testLLUDPServer.LoadReceive(uccp, testEp); + testLLUDPServer.ReceiveData(null); // Should succeed now Assert.IsTrue(testLLUDPServer.HasCircuit(myCircuitCode)); @@ -196,24 +196,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests /// /// Test removing a client from the stack /// - [Test] + [Test] public void TestRemoveClient() { TestHelper.InMethod(); - uint myCircuitCode = 123457; + uint myCircuitCode = 123457; TestLLUDPServer testLLUDPServer; TestLLPacketServer testLLPacketServer; AgentCircuitManager acm; - SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm); + SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm); AddClient(myCircuitCode, new IPEndPoint(IPAddress.Loopback, 1000), testLLUDPServer, acm); - testLLUDPServer.RemoveClientCircuit(myCircuitCode); + testLLUDPServer.RemoveClientCircuit(myCircuitCode); Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode)); // Check that removing a non-existant circuit doesn't have any bad effects - testLLUDPServer.RemoveClientCircuit(101); + testLLUDPServer.RemoveClientCircuit(101); Assert.IsFalse(testLLUDPServer.HasCircuit(101)); } @@ -232,7 +232,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests TestLLUDPServer testLLUDPServer; TestLLPacketServer testLLPacketServer; AgentCircuitManager acm; - SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); + SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); AddClient(myCircuitCode, testEp, testLLUDPServer, acm); byte[] data = new byte[] { 0x01, 0x02, 0x03, 0x04 }; @@ -270,17 +270,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests uint circuitCodeA = 130000; EndPoint epA = new IPEndPoint(IPAddress.Loopback, 1300); UUID agentIdA = UUID.Parse("00000000-0000-0000-0000-000000001300"); - UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300"); + UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300"); uint circuitCodeB = 130001; EndPoint epB = new IPEndPoint(IPAddress.Loopback, 1301); UUID agentIdB = UUID.Parse("00000000-0000-0000-0000-000000001301"); - UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301"); + UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301"); TestLLUDPServer testLLUDPServer; TestLLPacketServer testLLPacketServer; AgentCircuitManager acm; - SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); + SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); AddClient(circuitCodeA, epA, agentIdA, sessionIdA, testLLUDPServer, acm); AddClient(circuitCodeB, epB, agentIdB, sessionIdB, testLLUDPServer, acm); @@ -293,7 +293,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA)); Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3)); - Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); - } + Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); + } } } diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs index 8b11ccc..cde155b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs @@ -45,7 +45,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests [Test] /// /// More a placeholder, really - /// + /// public void InPacketTest() { TestHelper.InMethod(); @@ -87,20 +87,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests /// /// /// - /// Agent circuit manager used in setting up the stack + /// Agent circuit manager used in setting up the stack protected void SetupStack( IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer, out AgentCircuitManager acm) { IConfigSource configSource = new IniConfigSource(); ClientStackUserSettings userSettings = new ClientStackUserSettings(); - testLLUDPServer = new TestLLUDPServer(); + testLLUDPServer = new TestLLUDPServer(); acm = new AgentCircuitManager(); - uint port = 666; + uint port = 666; testLLUDPServer.Initialise(null, ref port, 0, false, configSource, acm); testPacketServer = new TestLLPacketServer(testLLUDPServer, userSettings); - testLLUDPServer.LocalScene = scene; - } + testLLUDPServer.LocalScene = scene; + } } } diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs index d055969..1fba847 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs @@ -31,7 +31,7 @@ using OpenMetaverse.Packets; namespace OpenSim.Region.ClientStack.LindenUDP.Tests { public class TestLLPacketServer : LLPacketServer - { + { /// /// Record counts of packets received /// @@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests m_packetsReceived[packet.Type]++; else m_packetsReceived[packet.Type] = 1; - } + } public int GetTotalPacketsReceived() { diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs index 1dffefb..f98586d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs @@ -66,7 +66,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests ChunkSenderTuple tuple = m_chunksToLoad.Dequeue(); RecvBuffer = tuple.Data; numBytes = tuple.Data.Length; - epSender = tuple.Sender; + epSender = tuple.Sender; return true; } @@ -114,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests { while (m_chunksToLoad.Count > 0) OnReceivedData(result); - } + } /// /// Has a circuit with the given code been established? @@ -134,7 +134,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests /// Record the data and sender tuple /// public class ChunkSenderTuple - { + { public byte[] Data; public EndPoint Sender; public bool BeginReceiveException; diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index a266a40..bfce7b1 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -61,7 +61,7 @@ namespace OpenSim.Region.ClientStack get { return m_commsManager; } set { m_commsManager = value; } } - protected CommunicationsManager m_commsManager; + protected CommunicationsManager m_commsManager; protected StorageManager m_storageManager; @@ -82,13 +82,13 @@ namespace OpenSim.Region.ClientStack /// /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. /// - /// + /// protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier); protected abstract StorageManager CreateStorageManager(); protected abstract ClientStackManager CreateClientStackManager(); protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, - AgentCircuitManager circuitManager); + AgentCircuitManager circuitManager); protected override void StartupSpecific() { diff --git a/OpenSim/Region/ClientStack/ThrottleSettings.cs b/OpenSim/Region/ClientStack/ThrottleSettings.cs index 5dcb706..551dbdf 100644 --- a/OpenSim/Region/ClientStack/ThrottleSettings.cs +++ b/OpenSim/Region/ClientStack/ThrottleSettings.cs @@ -26,12 +26,12 @@ */ namespace OpenSim.Region.ClientStack -{ +{ /// /// Represent throttle settings for a client stack. These settings are in bytes per second /// public class ThrottleSettings - { + { /// /// Minimum bytes per second that the throttle can be set to. /// @@ -39,13 +39,13 @@ namespace OpenSim.Region.ClientStack /// /// Maximum bytes per second that the throttle can be set to. - /// + /// public int Max; /// /// Current bytes per second that the throttle should be set to. - /// - public int Current; + /// + public int Current; public ThrottleSettings(int min, int max, int current) { diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs index 002ea17..e80f6ab 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs @@ -50,11 +50,11 @@ namespace OpenSim.Region.Communications.Hypergrid HGUserServices userServices = new HGUserServices(this); // This plugin arrangement could eventually be configurable rather than hardcoded here. userServices.AddPlugin(new TemporaryUserProfilePlugin()); - userServices.AddPlugin(new HGUserDataPlugin(this, userServices)); + userServices.AddPlugin(new HGUserDataPlugin(this, userServices)); m_userService = userServices; m_messageService = userServices; - m_avatarService = userServices; + m_avatarService = userServices; } } } diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs index f5126ca..4e3f5a1 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs @@ -41,13 +41,13 @@ namespace OpenSim.Region.Communications.Hypergrid public class HGCommunicationsStandalone : CommunicationsManager { public HGCommunicationsStandalone( - ConfigSettings configSettings, + ConfigSettings configSettings, NetworkServersInfo serversInfo, BaseHttpServer httpServer, LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile) : base(serversInfo, libraryRootFolder) - { + { LocalUserServices localUserService = new LocalUserServices( serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); @@ -58,8 +58,8 @@ namespace OpenSim.Region.Communications.Hypergrid hgUserService.AddPlugin(new TemporaryUserProfilePlugin()); hgUserService.AddPlugin(new HGUserDataPlugin(this, hgUserService)); - m_userService = hgUserService; - m_userAdminService = hgUserService; + m_userService = hgUserService; + m_userAdminService = hgUserService; m_avatarService = hgUserService; m_messageService = hgUserService; diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs index f1a56ef..49a2261 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs @@ -87,7 +87,7 @@ namespace OpenSim.Region.Communications.Hypergrid return m_localUserServices.AddUserAgent(agentdata); return base.AddUserAgent(agentdata); - } + } public override UserAgentData GetAgentByUUID(UUID userId) { diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index 99bcea3..eaf996d 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs @@ -37,7 +37,7 @@ namespace OpenSim.Region.Communications.Local public class CommunicationsLocal : CommunicationsManager { public CommunicationsLocal( - ConfigSettings configSettings, + ConfigSettings configSettings, NetworkServersInfo serversInfo, LibraryRootFolder libraryRootFolder) : base(serversInfo, libraryRootFolder) @@ -47,13 +47,13 @@ namespace OpenSim.Region.Communications.Local = new LocalUserServices( serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); lus.AddPlugin(new TemporaryUserProfilePlugin()); - lus.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource); + lus.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource); m_userService = lus; - m_userAdminService = lus; + m_userAdminService = lus; m_avatarService = lus; m_messageService = lus; - //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService); + //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService); } } } diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index d18937e..89b55c4 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs @@ -94,7 +94,7 @@ namespace OpenSim.Region.Communications.Local if (md5PasswordHash == userProfile.PasswordHash) return true; else - return false; - } + return false; + } } } \ No newline at end of file diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs index c2b8f26..94e4ed2 100644 --- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs +++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs @@ -40,7 +40,7 @@ namespace OpenSim.Region.Communications.OGS1 : base(serversInfo, libraryRootFolder) { - // This plugin arrangement could eventually be configurable rather than hardcoded here. + // This plugin arrangement could eventually be configurable rather than hardcoded here. OGS1UserServices userServices = new OGS1UserServices(this); userServices.AddPlugin(new TemporaryUserProfilePlugin()); userServices.AddPlugin(new OGS1UserDataPlugin(this)); diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs index 01d6ec8..2f9a45f 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs @@ -81,7 +81,7 @@ namespace OpenSim.Region.Communications.OGS1 public virtual void AddTemporaryUserProfile(UserProfileData userProfile) { // Not interested - } + } public UserProfileData GetUserByUri(Uri uri) { @@ -695,7 +695,7 @@ namespace OpenSim.Region.Communications.OGS1 userData.Partner = UUID.Zero; return userData; - } + } protected AvatarAppearance ConvertXMLRPCDataToAvatarAppearance(Hashtable data) { @@ -766,6 +766,6 @@ namespace OpenSim.Region.Communications.OGS1 } return buddylist; - } + } } } diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 51ba2e9..ed3526d 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs @@ -41,7 +41,7 @@ using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Clients; namespace OpenSim.Region.Communications.OGS1 -{ +{ public class OGS1UserServices : UserManagerBase { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -94,7 +94,7 @@ namespace OpenSim.Region.Communications.OGS1 catch (WebException) { m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff"); - } + } } /// @@ -150,10 +150,10 @@ namespace OpenSim.Region.Communications.OGS1 IList parameters = new ArrayList(); parameters.Add(param); XmlRpcRequest req = new XmlRpcRequest("authenticate_user_by_password", parameters); - XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000); + XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000); // Temporary measure to deal with older services - if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD) + if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD) { throw new Exception( String.Format( @@ -170,7 +170,7 @@ namespace OpenSim.Region.Communications.OGS1 else { return false; - } + } } } } \ No newline at end of file diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs index addc36b..9c646b6 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs @@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); transactions.RequestUpdateTaskInventoryItem(remoteClient, part, transactionID, item); - } + } /// /// Request that a client (agent) begin an asset transfer. diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index 0c6900d..2a1355b 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs @@ -49,9 +49,9 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities /// protected Dictionary m_capsHandlers = new Dictionary(); - protected Dictionary capsPaths = new Dictionary(); + protected Dictionary capsPaths = new Dictionary(); protected Dictionary> childrenSeeds - = new Dictionary>(); + = new Dictionary>(); public void Initialise(IConfigSource source) { @@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities agentId, m_scene.RegionInfo.RegionName); } } - } + } public Caps GetCapsHandlerForUser(UUID agentId) { @@ -177,7 +177,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities } return null; - } + } public Dictionary GetChildrenSeeds(UUID agentID) { @@ -225,6 +225,6 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities y = y / Constants.RegionSize; m_log.Info(" >> "+x+", "+y+": "+kvp.Value); } - } + } } } diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs index 394b1bb..8502006 100644 --- a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs +++ b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan { // Only need to run through all this if there are entries in the ban list if (bans.Count > 0) - { + { IClientIPEndpoint ipEndpoint; if (client.TryGet(out ipEndpoint)) { diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 937f76b..1fdb003 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs @@ -361,7 +361,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender m_cacheddecode.Remove(AssetId); m_cacheddecode.Add(AssetId, layers); - } + } // Notify Interested Parties lock (m_notifyList) diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs index a1e27f1..5a5ad7e 100644 --- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Asset /// /// Cache is enabled by setting "AssetCaching" configuration to value "CenomeMemoryAssetCache". /// When cache is successfully enable log should have message - /// "[ASSET CACHE]: Cenome asset cache enabled (MaxSize = XXX bytes, MaxCount = XXX, ExpirationTime = XXX)". + /// "[ASSET CACHE]: Cenome asset cache enabled (MaxSize = XXX bytes, MaxCount = XXX, ExpirationTime = XXX)". /// /// /// Cache's size is limited by two parameters: @@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Asset /// /// Asset's default expiration time in the cache. - /// + /// public static readonly TimeSpan DefaultExpirationTime = TimeSpan.FromMinutes(30.0); /// diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 37cccc8..817e0d4 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs @@ -470,7 +470,7 @@ namespace Flotsam.RegionModules.AssetCache else if (dirSize >= m_CacheWarnAt) { m_log.WarnFormat("[FLOTSAM ASSET CACHE]: Cache folder exceeded CacheWarnAt limit {0} {1}. Suggest increasing tiers, tier length, or reducing cache expiration", dir, dirSize); - } + } } private string GetFileName(string id) diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index fcc2673..66a9b5a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat scene.EventManager.OnChatBroadcast -= OnChatBroadcast; m_scenes.Remove(scene); } - } + } } public virtual void Close() diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index 046fc4a..413c6e8 100644 --- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs @@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog this, "alert", "alert ", "Send an alert to a user", HandleAlertConsoleCommand); m_scene.AddCommand( - this, "alert general", "alert general ", "Send an alert to everyone", HandleAlertConsoleCommand); + this, "alert general", "alert general ", "Send an alert to everyone", HandleAlertConsoleCommand); } public void PostInitialise() {} @@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog public void SendAlertToUser(IClientAPI client, string message) { SendAlertToUser(client, message, false); - } + } public void SendAlertToUser(IClientAPI client, string message, bool modal) { @@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog public void SendAlertToUser(UUID agentID, string message) { SendAlertToUser(agentID, message, false); - } + } public void SendAlertToUser(UUID agentID, string message, bool modal) { @@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog if (sp != null) sp.ControllingClient.SendAgentAlertMessage(message, modal); - } + } public void SendAlertToUser(string firstName, string lastName, string message, bool modal) { @@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog break; } } - } + } public void SendGeneralAlert(string message) { @@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog if (!presence.IsChildAgent) presence.ControllingClient.SendAlertMessage(message); } - } + } public void SendDialogToUser( UUID avatarID, string objectName, UUID objectID, UUID ownerID, @@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog { ScenePresence sp = m_scene.GetScenePresence(avatarID); - if (sp != null) + if (sp != null) sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); - } + } public void SendNotificationToUsersInEstate( UUID fromAvatarID, string fromAvatarName, string message) @@ -145,11 +145,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog // TODO: This does not yet do what it says on the tin - it only sends the message to users in the same // region as the sending avatar. SendNotificationToUsersInRegion(fromAvatarID, fromAvatarName, message); - } + } public void SendNotificationToUsersInRegion( UUID fromAvatarID, string fromAvatarName, string message) - { + { List presenceList = m_scene.GetScenePresences(); foreach (ScenePresence presence in presenceList) @@ -199,6 +199,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog } return result; - } + } } } diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index dd9b318..fc7d63a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs @@ -497,7 +497,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends { m_log.ErrorFormat("[FRIENDS]: No user found for id {0} in OfferFriendship()", fromUserId); } - } + } #region FriendRequestHandling @@ -508,7 +508,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends if (im.dialog == (byte)InstantMessageDialog.FriendshipOffered) // 38 { - // fromAgentName is the *destination* name (the friend we offer friendship to) + // fromAgentName is the *destination* name (the friend we offer friendship to) ScenePresence initiator = GetAnyPresenceFromAgentID(new UUID(im.fromAgentID)); im.fromAgentName = initiator != null ? initiator.Name : "(hippo)"; @@ -528,13 +528,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends /// Invoked when a user offers a friendship. /// /// - /// + /// /// private void FriendshipOffered(GridInstantMessage im) { // this is triggered by the initiating agent: // A local agent offers friendship to some possibly remote friend. - // A IM is triggered, processed here and sent to the friend (possibly in a remote region). + // A IM is triggered, processed here and sent to the friend (possibly in a remote region). m_log.DebugFormat("[FRIEND]: Offer(38) - From: {0}, FromName: {1} To: {2}, Session: {3}, Message: {4}, Offline {5}", im.fromAgentID, im.fromAgentName, im.toAgentID, im.imSessionID, im.message, im.offline); @@ -559,7 +559,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success); } ); - } + } } /// @@ -570,7 +570,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends private void FriendshipAccepted(IClientAPI client, GridInstantMessage im) { m_log.DebugFormat("[FRIEND]: 39 - from client {0}, agent {2} {3}, imsession {4} to {5}: {6} (dialog {7})", - client.AgentId, im.fromAgentID, im.fromAgentName, im.imSessionID, im.toAgentID, im.message, im.dialog); + client.AgentId, im.fromAgentID, im.fromAgentName, im.imSessionID, im.toAgentID, im.message, im.dialog); } /// @@ -602,7 +602,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends delegate(bool success) { m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success); } - ); + ); } private void OnGridInstantMessage(GridInstantMessage msg) diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs index ff12361..8ce5092 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs @@ -91,6 +91,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures else m_log.ErrorFormat( "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name); - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index 8926527..f941728 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods { m_scene = scene; m_dialogModule = m_scene.RequestModuleInterface(); - m_scene.RegisterModuleInterface(this); + m_scene.RegisterModuleInterface(this); } public void PostInitialise() {} @@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods m_dialogModule.SendAlertToUser(agentID, "Request for god powers denied"); } } - } + } /// /// Kicks User specified from the simulator. This logs them off of the grid @@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods } } else - { + { m_dialogModule.SendAlertToUser(godID, "Kick request denied"); } } diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index 66f1e14..9a68749 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs @@ -38,7 +38,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage { public class InstantMessageModule : IRegionModule { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// Is this module enabled? diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 907e2d4..f761bf0 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs @@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// /// We only use this to request modules /// - protected Scene m_scene; + protected Scene m_scene; /// /// The stream from which the inventory archive will be loaded. @@ -186,7 +186,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver item.Folder = foundFolder.ID; //m_userInfo.AddItem(item); - m_scene.InventoryService.AddItem(item); + m_scene.InventoryService.AddItem(item); successfulItemRestores++; // If we're loading an item directly into the given destination folder then we need to record @@ -299,14 +299,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver = new InventoryFolderBase( newFolderId, newFolderName, m_userInfo.UserProfile.ID, (short)AssetType.Unknown, destFolder.ID, 1); - m_scene.InventoryService.AddFolder(destFolder); + m_scene.InventoryService.AddFolder(destFolder); // UUID newFolderId = UUID.Random(); // m_scene.InventoryService.AddFolder( // m_userInfo.CreateFolder( // folderName, newFolderId, (ushort)AssetType.Folder, foundFolder.ID); -// m_log.DebugFormat("[INVENTORY ARCHIVER]: Retrieving newly created folder {0}", folderName); +// m_log.DebugFormat("[INVENTORY ARCHIVER]: Retrieving newly created folder {0}", folderName); // foundFolder = foundFolder.GetChildFolder(newFolderId); // m_log.DebugFormat( // "[INVENTORY ARCHIVER]: Retrieved newly created folder {0} with ID {1}", @@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver nodesLoaded.Add(destFolder); i++; - } + } return destFolder; @@ -357,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver rawFolders[i++], newFolderId, (ushort)AssetType.Folder, foundFolder.ID); foundFolder = foundFolder.GetChildFolder(newFolderId); } - */ + */ } /// diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs index 5ebf2fa..a73f868 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// /// Find a folder given a PATH_DELIMITER delimited path starting from a user's root folder - /// + /// /// /// This method does not handle paths that contain multiple delimitors /// @@ -71,11 +71,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver return null; return FindFolderByPath(inventoryService, rootFolder, path); - } + } /// /// Find a folder given a PATH_DELIMITER delimited path starting from this folder - /// + /// /// /// This method does not handle paths that contain multiple delimitors /// @@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver return null; return FindItemByPath(inventoryService, rootFolder, path); - } + } /// /// Find an item given a PATH_DELIMITOR delimited path starting from this folder. @@ -194,7 +194,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver } else { - InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID); + InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID); foreach (InventoryFolderBase folder in contents.Folders) { @@ -205,6 +205,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver // We didn't find an item or intermediate folder with the given name return null; - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index c6ebb24..499c552 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs @@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver private InventoryArchiverModule m_module; private CachedUserInfo m_userInfo; - private string m_invPath; + private string m_invPath; protected TarArchiveWriter m_archiveWriter; protected UuidGatherer m_assetGatherer; @@ -168,7 +168,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver { path += CreateArchiveFolderName(inventoryFolder); - // We need to make sure that we record empty folders + // We need to make sure that we record empty folders m_archiveWriter.WriteDir(path); } @@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver if (maxComponentIndex >= 0 && components[maxComponentIndex] == STAR_WILDCARD) { foundStar = true; - maxComponentIndex--; + maxComponentIndex--; } m_invPath = String.Empty; @@ -369,8 +369,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// public static string CreateArchiveFolderName(InventoryFolderBase folder) { - return CreateArchiveFolderName(folder.Name, folder.ID); - } + return CreateArchiveFolderName(folder.Name, folder.ID); + } /// /// Create the archive name for a particular item. @@ -383,7 +383,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// public static string CreateArchiveItemName(InventoryItemBase item) { - return CreateArchiveItemName(item.Name, item.ID); + return CreateArchiveItemName(item.Name, item.ID); } /// @@ -398,7 +398,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver "{0}{1}{2}/", name, ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, - id); + id); } /// @@ -406,14 +406,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// /// /// - /// + /// public static string CreateArchiveItemName(string name, UUID id) { return string.Format( "{0}{1}{2}.xml", name, ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, - id); + id); } /// @@ -438,6 +438,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver sw.Close(); return s; - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 55dce05..1228eb1 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs @@ -40,12 +40,12 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver -{ +{ /// /// This module loads and saves OpenSimulator inventory archives - /// + /// public class InventoryArchiverModule : IRegionModule, IInventoryArchiverModule - { + { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public string Name { get { return "Inventory Archiver Module"; } } @@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// public bool DisablePresenceChecks { get; set; } - public event InventoryArchiveSaved OnInventoryArchiveSaved; + public event InventoryArchiveSaved OnInventoryArchiveSaved; /// /// The file to load and save inventory if no filename has been specified @@ -83,7 +83,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver } public void Initialise(Scene scene, IConfigSource source) - { + { if (m_scenes.Count == 0) { scene.RegisterModuleInterface(this); @@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver m_aScene = scene; } - m_scenes[scene.RegionInfo.RegionID] = scene; + m_scenes[scene.RegionInfo.RegionID] = scene; } public void PostInitialise() {} @@ -119,7 +119,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved; if (handlerInventoryArchiveSaved != null) handlerInventoryArchiveSaved(id, succeeded, userInfo, invPath, saveStream, reportedException); - } + } public bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream) { @@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver public bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, Stream loadStream) { if (m_scenes.Count > 0) - { + { CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); if (userInfo != null) @@ -182,7 +182,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver if (CheckPresence(userInfo.UserProfile.ID)) { InventoryArchiveReadRequest request = - new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream); + new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream); UpdateClientWithLoadedNodes(userInfo, request.Execute()); return true; @@ -197,12 +197,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver } return false; - } + } public bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, string loadPath) { if (m_scenes.Count > 0) - { + { CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); if (userInfo != null) @@ -210,7 +210,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver if (CheckPresence(userInfo.UserProfile.ID)) { InventoryArchiveReadRequest request = - new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath); + new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath); UpdateClientWithLoadedNodes(userInfo, request.Execute()); return true; @@ -221,11 +221,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator", userInfo.UserProfile.Name, userInfo.UserProfile.ID); } - } + } } return false; - } + } /// /// Load inventory from an inventory file archive @@ -252,7 +252,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver "[INVENTORY ARCHIVER]: Loading archive {0} to inventory path {1} for {2} {3}", loadPath, invPath, firstName, lastName); - if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath)) + if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath)) m_log.InfoFormat( "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}", loadPath, firstName, lastName); @@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver lock (m_pendingConsoleSaves) m_pendingConsoleSaves.Add(id); - } + } private void SaveInvConsoleCommandCompleted( Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, @@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// User password /// protected CachedUserInfo GetUserInfo(string firstName, string lastName, string pass) - { + { CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); //m_aScene.CommsManager.UserService.GetUserProfile(firstName, lastName); if (null == userInfo) @@ -334,7 +334,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver } try - { + { if (m_aScene.CommsManager.UserService.AuthenticateUserByPassword(userInfo.UserProfile.ID, pass)) { return userInfo; @@ -343,7 +343,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver { m_log.ErrorFormat( "[INVENTORY ARCHIVER]: Password for user {0} {1} incorrect. Please try again.", - firstName, lastName); + firstName, lastName); return null; } } @@ -359,7 +359,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// /// Can be empty. In which case, nothing happens private void UpdateClientWithLoadedNodes(CachedUserInfo userInfo, List loadedNodes) - { + { if (loadedNodes.Count == 0) return; @@ -368,7 +368,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver ScenePresence user = scene.GetScenePresence(userInfo.UserProfile.ID); if (user != null && !user.IsChildAgent) - { + { foreach (InventoryNodeBase node in loadedNodes) { // m_log.DebugFormat( @@ -379,8 +379,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver } break; - } - } + } + } } /// diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index ed293cd..b0fdcd6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs @@ -37,7 +37,7 @@ using OpenMetaverse; using OpenSim.Data; using OpenSim.Framework; using OpenSim.Framework.Serialization; -using OpenSim.Framework.Serialization.External; +using OpenSim.Framework.Serialization.External; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Osp; @@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests Exception reportedException) { mre.Set(); - } + } /// /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). @@ -157,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests string expectedObject1FilePath = string.Format( "{0}{1}{2}", ArchiveConstants.INVENTORY_PATH, - InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder), + InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder), expectedObject1FileName); string filePath; @@ -195,7 +195,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests Assert.That(gotObject1File, Is.True, "No item1 file in archive"); // Assert.That(gotObject2File, Is.True, "No object2 file in archive"); - // TODO: Test presence of more files and contents of files. + // TODO: Test presence of more files and contents of files. } /// @@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests /// This test also does some deeper probing of loading into nested inventory structures [Test] public void TestLoadIarV0_1ExistingUsers() - { + { TestHelper.InMethod(); //log4net.Config.XmlConfigurator.Configure(); @@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1)); tar.Close(); - MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); + MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); SerialiserModule serialiserModule = new SerialiserModule(); InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); @@ -271,9 +271,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests Assert.That(foundItem1.Owner, Is.EqualTo(userUuid), "Loaded item owner doesn't match inventory reciever"); - // Now try loading to a root child folder + // Now try loading to a root child folder UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xA"); - archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); + archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream); InventoryItemBase foundItem2 @@ -282,12 +282,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests // Now try loading to a more deeply nested folder UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC"); - archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); + archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream); InventoryItemBase foundItem3 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + itemName); - Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3"); + Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3"); } /// @@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests /// (as tested in the a later commented out test) [Test] public void TestLoadIarV0_1AbsentUsers() - { + { TestHelper.InMethod(); log4net.Config.XmlConfigurator.Configure(); @@ -331,7 +331,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1)); tar.Close(); - MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); + MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); SerialiserModule serialiserModule = new SerialiserModule(); InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); @@ -357,8 +357,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests // "Loaded item non-uuid creator doesn't match that of the loading user"); Assert.That( foundItem1.CreatorIdAsUuid, Is.EqualTo(userUuid), - "Loaded item uuid creator doesn't match that of the loading user"); - } + "Loaded item uuid creator doesn't match that of the loading user"); + } /// /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where @@ -367,7 +367,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests /// Disabled since temporary profiles have not yet been implemented. //[Test] public void TestLoadIarV0_1TempProfiles() - { + { TestHelper.InMethod(); log4net.Config.XmlConfigurator.Configure(); @@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1)); tar.Close(); - MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); + MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); SerialiserModule serialiserModule = new SerialiserModule(); InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); @@ -436,7 +436,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests Assert.That(foundItem.Owner, Is.EqualTo(userUuid)); Console.WriteLine("### Successfully completed {0} ###", MethodBase.GetCurrentMethod()); - } + } /// /// Test replication of an archive path to the user's inventory. @@ -474,7 +474,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests string itemArchivePath = string.Format( "{0}{1}{2}{3}", - ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName); + ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName); //Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder); diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 75976e2..734230c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs @@ -172,9 +172,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length); if (user != null && !user.IsChildAgent) - { + { user.ControllingClient.SendBulkUpdateInventory(folderCopy); - } + } } else { @@ -199,10 +199,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer } copyID = itemCopy.ID; - Array.Copy(copyID.GetBytes(), 0, im.binaryBucket, 1, 16); + Array.Copy(copyID.GetBytes(), 0, im.binaryBucket, 1, 16); if (user != null && !user.IsChildAgent) - { + { user.ControllingClient.SendBulkUpdateInventory(itemCopy); } } @@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer } } else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) - { + { // Here, the recipient is local and we can assume that the // inventory is loaded. Courtesy of the above bulk update, // It will have been pushed to the client, too @@ -284,7 +284,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer } if ((null == item && null == folder) | null == trashFolder) - { + { string reason = String.Empty; if (trashFolder == null) diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs index 0cdd9a8..1b23d92 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs @@ -454,7 +454,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue responsedata["error_status_text"] = "Upstream error:"; responsedata["http_protocol_version"] = "HTTP/1.0"; return responsedata; - } + } OSDArray array = new OSDArray(); if (element == null) // didn't have an event in 15s diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index e9c1e9d..7d6f150 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs @@ -353,11 +353,11 @@ namespace OpenSim.Region.CoreModules.InterGrid return responseMap; } - // Using OpenSim.Framework.Capabilities.Caps here one time.. + // Using OpenSim.Framework.Capabilities.Caps here one time.. // so the long name is probably better then a using statement public void OnRegisterCaps(UUID agentID, Caps caps) { - /* If we ever want to register our own caps here.... + /* If we ever want to register our own caps here.... * string capsBase = "/CAPS/" + caps.CapsObjectPath; caps.RegisterHandler("CAPNAME", diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index bea6222..d57a8e5 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs @@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender string value = ""; if (nvp[0] != null) - { + { name = nvp[0].Trim(); } @@ -291,10 +291,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender temp = 128; width = temp; - height = temp; + height = temp; } } - break; + break; } } @@ -410,7 +410,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender Font myFont = new Font(fontName, fontSize); SolidBrush myBrush = new SolidBrush(Color.Black); - char[] lineDelimiter = {dataDelim}; + char[] lineDelimiter = {dataDelim}; char[] partsDelimiter = {','}; string[] lines = data.Split(lineDelimiter); diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs index e69613a..85a1ac3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs @@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization public bool IsAuthorizedForRegion(string userID, string regionID, out string message) { - return m_AuthorizationService.IsAuthorizedForRegion(userID, regionID, out message); + return m_AuthorizationService.IsAuthorizedForRegion(userID, regionID, out message); } } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs index a672f4f..fca2df2 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs @@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization else { m_log.ErrorFormat("[REMOTE AUTHORIZATION CONNECTOR] IsAuthorizedForRegion, can't find scene to match region id of {0} ",regionID); - } + } return isAuthorized; diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 376ea8a..65f83fd 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs @@ -110,12 +110,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver TarArchiveReader.TarEntryType entryType; while ((data = archive.ReadEntry(out filePath, out entryType)) != null) - { + { //m_log.DebugFormat( // "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length); if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType) - continue; + continue; if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) { @@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface(); - int sceneObjectsLoadedCount = 0; + int sceneObjectsLoadedCount = 0; foreach (string serialisedSceneObject in serialisedSceneObjects) { @@ -499,7 +499,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); XmlTextReader xtr - = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context); + = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context); RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 63608a8..9e4fbbe 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs @@ -74,14 +74,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_scene = scene; m_saveStream = saveStream; m_requestId = requestId; - } + } /// /// Archive the region requested. /// /// if there was an io problem with creating the file public void ArchiveRegion() - { + { Dictionary assetUuids = new Dictionary(); List entities = m_scene.GetEntities(); @@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_scene.RequestModuleInterface(), m_scene, archiveWriter, - m_requestId); + m_requestId); new AssetsRequest( new AssetsArchiver(archiveWriter), assetUuids.Keys, diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 5c58b69..8d4f91b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs @@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void Close() { - } + } public void ArchiveRegion(string savePath) { @@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.InfoFormat( "[ARCHIVER]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath); - new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion(); + new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion(); } public void ArchiveRegion(Stream saveStream) @@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void ArchiveRegion(Stream saveStream, Guid requestId) { new ArchiveWriteRequestPreparation(m_scene, saveStream, requestId).ArchiveRegion(); - } + } public void DearchiveRegion(string loadPath) { @@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver "[ARCHIVER]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath); new ArchiveReadRequest(m_scene, loadPath, merge, requestId).DearchiveRegion(); - } + } public void DearchiveRegion(Stream loadStream) { @@ -124,6 +124,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void DearchiveRegion(Stream loadStream, bool merge, Guid requestId) { new ArchiveReadRequest(m_scene, loadStream, merge, requestId).DearchiveRegion(); - } + } } } diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index 330fa3f..95d109c 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs @@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver /// /// public void WriteAsset(AssetBase asset) - { + { //WriteMetadata(archive); WriteData(asset); } diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 82803bf..fe9c8d9 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs @@ -115,7 +115,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_requestCallbackTimer = new System.Timers.Timer(TIMEOUT); m_requestCallbackTimer.AutoReset = false; - m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout); + m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout); } protected internal void Execute() @@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver protected void OnRequestCallbackTimeout(object source, ElapsedEventArgs args) { try - { + { lock (this) { // Take care of the possibilty that this thread started but was paused just outside the lock before @@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver } // Calculate which uuids were not found. This is an expensive way of doing it, but this is a failure - // case anyway. + // case anyway. List uuids = new List(); foreach (UUID uuid in m_uuids) { @@ -188,7 +188,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.ErrorFormat( "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT); - m_log.Error("[ARCHIVER]: OAR save aborted."); + m_log.Error("[ARCHIVER]: OAR save aborted."); } catch (Exception e) { @@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver { //m_log.DebugFormat("[ARCHIVER]: Received callback for asset {0}", id); - m_requestCallbackTimer.Stop(); + m_requestCallbackTimer.Stop(); if (m_requestState == RequestState.Aborted) { @@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver } catch (Exception e) { - m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); + m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); } } diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 5c42e94..edac4a4 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs @@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests m_lastErrorMessage = errorMessage; Console.WriteLine("About to pulse ArchiverTests on LoadCompleted"); - Monitor.PulseAll(this); + Monitor.PulseAll(this); } } @@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests archiverModule.ArchiveRegion(archiveWriteStream, requestId); //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer; //while (assetServer.HasWaitingRequests()) - // assetServer.ProcessNextRequest(); + // assetServer.ProcessNextRequest(); Monitor.Wait(this, 60000); } @@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests // Also check that direct entries which will also have a file entry containing that directory doesn't // upset load - tar.WriteDir(ArchiveConstants.TERRAINS_PATH); + tar.WriteDir(ArchiveConstants.TERRAINS_PATH); tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile()); @@ -251,7 +251,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests { scene.EventManager.OnOarFileLoaded += LoadCompleted; archiverModule.DearchiveRegion(archiveReadStream); - } + } Assert.That(m_lastErrorMessage, Is.Null); @@ -271,7 +271,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests /// /// Test merging a V0.2 OpenSim Region Archive into an existing scene - /// + /// //[Test] public void TestMergeOarV0_2() { diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 2701f60..3be5f45 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -954,7 +954,7 @@ namespace OpenSim.Region.CoreModules.World.Land public void SetMediaUrl(string url) { landData.MediaURL = url; - sendLandUpdateToAvatarsOverMe(); + sendLandUpdateToAvatarsOverMe(); } /// @@ -964,7 +964,7 @@ namespace OpenSim.Region.CoreModules.World.Land public void SetMusicUrl(string url) { landData.MusicURL = url; - sendLandUpdateToAvatarsOverMe(); + sendLandUpdateToAvatarsOverMe(); } } } diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs index 65f22b1..2cbaf96 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs @@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Land private void LocalRezObject(IClientAPI remoteclient, UUID itemid, Vector3 rayend, Vector3 raystart, UUID raytargetid, byte bypassraycast, bool rayendisintersection, bool rezselected, bool removeitem, UUID fromtaskid) - { + { int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX; int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY; rayend.X += differenceX * (int)Constants.RegionSize; diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 710e356..d9f377b 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs @@ -880,7 +880,7 @@ namespace OpenSim.Region.CoreModules.World.Land VirtualRegion.Permissions.OnDuplicateObject += BigRegion.PermissionModule.CanDuplicateObject; VirtualRegion.Permissions.OnDeleteObject += BigRegion.PermissionModule.CanDeleteObject; //MAYBE FULLY IMPLEMENTED VirtualRegion.Permissions.OnEditObject += BigRegion.PermissionModule.CanEditObject; //MAYBE FULLY IMPLEMENTED - VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED + VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED VirtualRegion.Permissions.OnInstantMessage += BigRegion.PermissionModule.CanInstantMessage; VirtualRegion.Permissions.OnInventoryTransfer += BigRegion.PermissionModule.CanInventoryTransfer; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnIssueEstateCommand += BigRegion.PermissionModule.CanIssueEstateCommand; //FULLY IMPLEMENTED @@ -899,11 +899,11 @@ namespace OpenSim.Region.CoreModules.World.Land VirtualRegion.Permissions.OnDelinkObject += BigRegion.PermissionModule.CanDelinkObject; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnBuyLand += BigRegion.PermissionModule.CanBuyLand; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnViewNotecard += BigRegion.PermissionModule.CanViewNotecard; //NOT YET IMPLEMENTED - VirtualRegion.Permissions.OnViewScript += BigRegion.PermissionModule.CanViewScript; //NOT YET IMPLEMENTED - VirtualRegion.Permissions.OnEditNotecard += BigRegion.PermissionModule.CanEditNotecard; //NOT YET IMPLEMENTED - VirtualRegion.Permissions.OnEditScript += BigRegion.PermissionModule.CanEditScript; //NOT YET IMPLEMENTED + VirtualRegion.Permissions.OnViewScript += BigRegion.PermissionModule.CanViewScript; //NOT YET IMPLEMENTED + VirtualRegion.Permissions.OnEditNotecard += BigRegion.PermissionModule.CanEditNotecard; //NOT YET IMPLEMENTED + VirtualRegion.Permissions.OnEditScript += BigRegion.PermissionModule.CanEditScript; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnCreateObjectInventory += BigRegion.PermissionModule.CanCreateObjectInventory; //NOT IMPLEMENTED HERE - VirtualRegion.Permissions.OnEditObjectInventory += BigRegion.PermissionModule.CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED + VirtualRegion.Permissions.OnEditObjectInventory += BigRegion.PermissionModule.CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED VirtualRegion.Permissions.OnCopyObjectInventory += BigRegion.PermissionModule.CanCopyObjectInventory; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnDeleteObjectInventory += BigRegion.PermissionModule.CanDeleteObjectInventory; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnResetScript += BigRegion.PermissionModule.CanResetScript; diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index f360577..b09c7a1 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions Administrators }; - #endregion + #endregion #region Bypass Permissions / Debug Permissions Stuff @@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// The set of users that are allowed to edit (save) scripts. This is only active if /// permissions are not being bypassed. This overrides normal permissions.- - /// + /// private UserSet m_allowedScriptEditors = UserSet.All; private Dictionary GrantLSL = new Dictionary(); @@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions m_scene.Permissions.OnDuplicateObject += CanDuplicateObject; m_scene.Permissions.OnDeleteObject += CanDeleteObject; //MAYBE FULLY IMPLEMENTED m_scene.Permissions.OnEditObject += CanEditObject; //MAYBE FULLY IMPLEMENTED - m_scene.Permissions.OnEditParcel += CanEditParcel; //MAYBE FULLY IMPLEMENTED + m_scene.Permissions.OnEditParcel += CanEditParcel; //MAYBE FULLY IMPLEMENTED m_scene.Permissions.OnInstantMessage += CanInstantMessage; m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer; //NOT YET IMPLEMENTED m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand; //FULLY IMPLEMENTED @@ -210,12 +210,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions m_scene.Permissions.OnBuyLand += CanBuyLand; //NOT YET IMPLEMENTED m_scene.Permissions.OnViewNotecard += CanViewNotecard; //NOT YET IMPLEMENTED - m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED - m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED - m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED + m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED + m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED + m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory; //NOT IMPLEMENTED HERE - m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED + m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; //NOT YET IMPLEMENTED m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; //NOT YET IMPLEMENTED m_scene.Permissions.OnResetScript += CanResetScript; @@ -249,7 +249,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions foreach (string uuidl in grant.Split(',')) { string uuid = uuidl.Trim(" \t".ToCharArray()); GrantLSL.Add(uuid, true); - } + } } grant = myConfig.GetString("GrantCS",""); @@ -431,7 +431,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions m_log.ErrorFormat( "[PERMISSIONS]: {0} is not a valid {1} value, setting to {2}", rawSetting, settingName, userSet); - } + } m_log.DebugFormat("[PERMISSIONS]: {0} {1}", settingName, userSet); @@ -942,7 +942,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_allowedScriptEditors == UserSet.Administrators && !IsAdministrator(user)) - return false; + return false; // Ordinarily, if you can view it, you can edit it // There is no viewing a no mod script @@ -957,7 +957,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanEditNotecard(UUID notecard, UUID objectID, UUID user, Scene scene) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); @@ -1377,11 +1377,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); - if (m_bypassPermissions) return m_bypassPermissionsValue; + if (m_bypassPermissions) return m_bypassPermissionsValue; if (objectID == UUID.Zero) // User inventory { @@ -1472,7 +1472,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanViewNotecard(UUID notecard, UUID objectID, UUID user, Scene scene) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); @@ -1609,7 +1609,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanCreateUserInventory(int invType, UUID userID) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); @@ -1619,7 +1619,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions if (m_allowedScriptCreators == UserSet.Administrators && !IsAdministrator(userID)) return false; - return true; + return true; } /// @@ -1627,27 +1627,27 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanCopyUserInventory(UUID itemID, UUID userID) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } /// /// Check whether the specified user is allowed to edit the given inventory item within their own inventory. /// /// /// - /// + /// private bool CanEditUserInventory(UUID itemID, UUID userID) - { + { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; + return true; } /// @@ -1655,14 +1655,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanDeleteUserInventory(UUID itemID, UUID userID) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } private bool CanTeleport(UUID userID, Scene scene) { diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs index e0331d3..58e4261 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs @@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser public void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName) { SceneXmlLoader.SaveNamedPrimsToXml2(scene, primName, fileName); - } + } public SceneObjectGroup DeserializeGroupFromXml2(string xmlString) { diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs index 373b6ab..799a448 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs @@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests { m_serialiserModule = new SerialiserModule(); m_scene = SceneSetupHelpers.SetupScene(""); - SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule); + SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule); } [Test] @@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests continue; switch (xtr.Name) - { + { case "UUID": xtr.ReadStartElement("UUID"); uuid = UUID.Parse(xtr.ReadElementString("Guid")); @@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests case "CreatorID": xtr.ReadStartElement("CreatorID"); creatorId = UUID.Parse(xtr.ReadElementString("Guid")); - xtr.ReadEndElement(); + xtr.ReadEndElement(); break; } } @@ -325,8 +325,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests // TODO: More checks Assert.That(uuid, Is.EqualTo(rpUuid)); Assert.That(name, Is.EqualTo(rpName)); - Assert.That(creatorId, Is.EqualTo(rpCreatorId)); - } + Assert.That(creatorId, Is.EqualTo(rpCreatorId)); + } [Test] public void TestDeserializeXml2() @@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests string xml2 = m_serialiserModule.SerializeGroupToXml2(so); XmlTextReader xtr = new XmlTextReader(new StringReader(xml2)); - xtr.ReadStartElement("SceneObjectGroup"); + xtr.ReadStartElement("SceneObjectGroup"); xtr.ReadStartElement("SceneObjectPart"); UUID uuid = UUID.Zero; @@ -385,7 +385,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests continue; switch (xtr.Name) - { + { case "UUID": xtr.ReadStartElement("UUID"); uuid = UUID.Parse(xtr.ReadElementString("Guid")); @@ -397,7 +397,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests case "CreatorID": xtr.ReadStartElement("CreatorID"); creatorId = UUID.Parse(xtr.ReadElementString("Guid")); - xtr.ReadEndElement(); + xtr.ReadEndElement(); break; } } diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 6cc0ed9..796b382 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs @@ -33,9 +33,9 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.CoreModules.World.Sound -{ +{ public class SoundModule : IRegionModule, ISoundModule - { + { //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected Scene m_scene; @@ -68,11 +68,11 @@ namespace OpenSim.Region.CoreModules.World.Sound if (dis > 100.0) // Max audio distance continue; - // Scale by distance + // Scale by distance gain = (float)((double)gain*((100.0 - dis) / 100.0)); p.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)gain, flags); - } + } } public virtual void TriggerSound( @@ -84,12 +84,12 @@ namespace OpenSim.Region.CoreModules.World.Sound if (dis > 100.0) // Max audio distance continue; - // Scale by distance + // Scale by distance gain = (float)((double)gain*((100.0 - dis) / 100.0)); p.ControllingClient.SendTriggeredSound( soundId, ownerID, objectID, parentID, handle, position, (float)gain); - } + } } } } diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs index aa38c09..0712a7f 100644 --- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs +++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs @@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules m_DayLengthHours = config.Configs["Sun"].GetDouble("day_length", d_day_length); // Horizon shift, this is used to shift the sun's orbit, this affects the day / night ratio - // must hard code to ~.5 to match sun position in LL based viewers + // must hard code to ~.5 to match sun position in LL based viewers m_HorizonShift = config.Configs["Sun"].GetDouble("day_night_offset", d_day_night); @@ -494,7 +494,7 @@ namespace OpenSim.Region.CoreModules receivedEstateToolsSunUpdate = true; // Generate shared values - GenSunPos(); + GenSunPos(); // When sun settings are updated, we should update all clients with new settings. SunUpdateToAllClients(); diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs index a09315a..c2ad7b8 100644 --- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs +++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation protected Scene m_scene; protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree }; - public PCode[] CreationCapabilities { get { return creationCapabilities; } } + public PCode[] CreationCapabilities { get { return creationCapabilities; } } public void Initialise(Scene scene, IConfigSource source) { @@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) { if (Array.IndexOf(creationCapabilities, (PCode)shape.PCode) < 0) - { + { m_log.DebugFormat("[VEGETATION]: PCode {0} not handled by {1}", shape.PCode, Name); return null; } @@ -111,6 +111,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation tree.Scale = new Vector3(4, 4, 4); break; } - } + } } } diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs index 41d2071..dcfb5a6 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs @@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins { m_windSpeeds[y * 16 + x] = m_curPredominateWind; } - } + } } public Vector3 WindSpeed(float fX, float fY, float fZ) diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs index 2c371da..071e20b 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs @@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins m_windSpeeds[y * 16 + x].Y *= m_strength; } } - } + } } public Vector3 WindSpeed(float fX, float fY, float fZ) diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index b442f6f..3283c1f 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs @@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules } avatar.ControllingClient.SendWindData(windSpeeds); - } + } } private void SendWindAllClients() diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs index b45b923..5fff89f 100644 --- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs @@ -67,7 +67,7 @@ namespace OpenSim.Region.DataSnapshot.Providers if (userInfo != null) { - UserProfileData userProfile = userInfo.UserProfile; + UserProfileData userProfile = userInfo.UserProfile; firstname = userProfile.FirstName; lastname = userProfile.SurName; diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index e9c35e9..f4526ae 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs @@ -789,7 +789,7 @@ namespace OpenSim.Region.Examples.SimpleModule public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks) { - } + } public void SendViewerTime(int phase) { diff --git a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs index c1ed1ac..0cc8fb6 100644 --- a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs +++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Interfaces sbyte type, byte wearableType, uint nextOwnerMask); void HandleTaskItemUpdateFromTransaction( - IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item); + IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item); void RemoveAgentAssetTransactions(UUID userID); } diff --git a/OpenSim/Region/Framework/Interfaces/ICommander.cs b/OpenSim/Region/Framework/Interfaces/ICommander.cs index 9371bea..6b872c1 100644 --- a/OpenSim/Region/Framework/Interfaces/ICommander.cs +++ b/OpenSim/Region/Framework/Interfaces/ICommander.cs @@ -33,7 +33,7 @@ namespace OpenSim.Region.Framework.Interfaces { /// /// The name of this commander - /// + /// string Name { get; } /// @@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Interfaces /// /// The commands available for this commander /// - Dictionary Commands { get; } + Dictionary Commands { get; } void ProcessConsoleCommand(string function, string[] args); void RegisterCommand(string commandName, ICommand command); diff --git a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs index a6ca7f1..d1c37da 100644 --- a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs @@ -37,15 +37,15 @@ namespace OpenSim.Region.Framework.Interfaces /// small interval. /// /// - /// - void SendAlertToUser(IClientAPI client, string message); + /// + void SendAlertToUser(IClientAPI client, string message); /// /// Send an alert message to a particular user. /// /// /// - /// + /// void SendAlertToUser(IClientAPI client, string message, bool modal); /// @@ -104,7 +104,7 @@ namespace OpenSim.Region.Framework.Interfaces /// /// void SendUrlToUser( - UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url); + UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url); /// /// Send a notification to all users in the scene. This notification should remain around until the @@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.Interfaces /// /// The user sending the message /// The name of the user doing the sending - /// The message being sent to the user + /// The message being sent to the user void SendNotificationToUsersInRegion(UUID fromAvatarID, string fromAvatarName, string message); /// diff --git a/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs index f3a3747..c39627c 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs @@ -29,13 +29,13 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Framework.Interfaces +namespace OpenSim.Region.Framework.Interfaces { /// /// Interface to a class that is capable of creating entities - /// + /// public interface IEntityCreator - { + { /// /// The entities that this class is capable of creating. These match the PCode format. /// @@ -51,6 +51,6 @@ namespace OpenSim.Region.Framework.Interfaces /// /// /// The entity created, or null if the creation failed - SceneObjectGroup CreateEntity(UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape); + SceneObjectGroup CreateEntity(UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape); } } diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs index 1ed92fb..2c906a2 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs @@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Interfaces /// /// Change every item in this inventory to a new group. /// - /// + /// void ChangeInventoryGroup(UUID groupID); /// @@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Interfaces /// /// /// - /// + /// void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource); /// @@ -150,7 +150,7 @@ namespace OpenSim.Region.Framework.Interfaces /// /// Return the name with which a client can request a xfer of this prim's inventory metadata - /// + /// string GetInventoryFileName(); bool GetInventoryFileName(IClientAPI client, uint localID); diff --git a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs index af54c76..7a8aba2 100644 --- a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs @@ -29,7 +29,7 @@ using OpenMetaverse; using OpenSim.Framework; namespace OpenSim.Region.Framework.Interfaces -{ +{ public interface IFriendsModule { /// @@ -43,7 +43,7 @@ namespace OpenSim.Region.Framework.Interfaces /// FIXME: This is somewhat too tightly coupled - it should arguably be possible to offer friendships even if the /// receiving user is not currently online. /// - /// - void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage); + /// + void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage); } } diff --git a/OpenSim/Region/Framework/Interfaces/IGodsModule.cs b/OpenSim/Region/Framework/Interfaces/IGodsModule.cs index 02abb05..552ce01 100644 --- a/OpenSim/Region/Framework/Interfaces/IGodsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGodsModule.cs @@ -29,7 +29,7 @@ using OpenMetaverse; using OpenSim.Framework; namespace OpenSim.Region.Framework.Interfaces -{ +{ /// /// This interface provides god related methods /// @@ -53,6 +53,6 @@ namespace OpenSim.Region.Framework.Interfaces /// the person that is being kicked /// This isn't used apparently /// The message to send to the user after it's been turned into a field - void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason); + void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason); } } diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs index 1622564..2d038ce 100644 --- a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs @@ -30,7 +30,7 @@ using System.IO; using OpenSim.Framework.Communications.Cache; namespace OpenSim.Region.Framework.Interfaces -{ +{ /// /// Used for the OnInventoryArchiveSaved event. /// @@ -43,11 +43,11 @@ namespace OpenSim.Region.Framework.Interfaces public delegate void InventoryArchiveSaved( Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, Exception reportedException); - public interface IInventoryArchiverModule + public interface IInventoryArchiverModule { /// /// Fired when an archive inventory save has been completed. - /// + /// event InventoryArchiveSaved OnInventoryArchiveSaved; /// @@ -69,6 +69,6 @@ namespace OpenSim.Region.Framework.Interfaces /// The inventory path from which the inventory should be saved. /// The stream to which the inventory archive will be saved /// true if the first stage of the operation succeeded, false otherwise - bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream); + bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream); } } diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs index 19b8574..74f404f 100644 --- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs +++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Interfaces /// /// Value between 0 - 256 on the x axis of the point /// Value between 0 - 256 on the y axis of the point - /// Land object at the point supplied + /// Land object at the point supplied ILandObject GetLandObject(int x, int y); ILandObject GetLandObject(int localID); @@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces /// /// Value between 0 - 256 on the x axis of the point /// Value between 0 - 256 on the y axis of the point - /// Land object at the point supplied + /// Land object at the point supplied ILandObject GetLandObject(float x, float y); bool IsLandPrimCountTainted(); diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs index 78b5322..fa64333 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs @@ -54,7 +54,7 @@ namespace OpenSim.Region.Framework.Interfaces /// /// /// If supplied, this request Id is later returned in the saved event - void ArchiveRegion(string savePath, Guid requestId); + void ArchiveRegion(string savePath, Guid requestId); /// /// Archive the region to a stream. @@ -88,7 +88,7 @@ namespace OpenSim.Region.Framework.Interfaces /// settings in the archive will be ignored. /// /// If supplied, this request Id is later returned in the saved event - void DearchiveRegion(string loadPath, bool merge, Guid requestId); + void DearchiveRegion(string loadPath, bool merge, Guid requestId); /// /// Dearchive a region from a stream. This replaces the existing scene. @@ -109,8 +109,8 @@ namespace OpenSim.Region.Framework.Interfaces /// /// If true, the loaded region merges with the existing one rather than replacing it. Any terrain or region /// settings in the archive will be ignored. - /// + /// /// If supplied, this request Id is later returned in the saved event - void DearchiveRegion(Stream loadStream, bool merge, Guid requestId); + void DearchiveRegion(Stream loadStream, bool merge, Guid requestId); } } diff --git a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs index 41a1e51..78bd622 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs @@ -71,21 +71,21 @@ namespace OpenSim.Region.Framework.Interfaces /// Load persisted objects from region storage. /// /// the Region UUID - /// List of loaded groups + /// List of loaded groups List LoadObjects(UUID regionUUID); /// /// Store a terrain revision in region storage /// /// HeightField data - /// region UUID + /// region UUID void StoreTerrain(double[,] terrain, UUID regionID); /// /// Load the latest terrain revision from region storage /// /// the region UUID - /// Heightfield data + /// Heightfield data double[,] LoadTerrain(UUID regionID); void StoreLandObject(ILandObject Parcel); @@ -96,7 +96,7 @@ namespace OpenSim.Region.Framework.Interfaces /// delete from landaccesslist where LandUUID=globalID /// /// - /// + /// void RemoveLandObject(UUID globalID); List LoadLandObjects(UUID regionUUID); diff --git a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs index bfd25d3..e7562a5 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs @@ -117,6 +117,6 @@ namespace OpenSim.Region.Framework.Interfaces /// /// /// - string SerializeGroupToXml2(SceneObjectGroup grp); + string SerializeGroupToXml2(SceneObjectGroup grp); } } diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs index 3d803ee..379fabd 100644 --- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs @@ -29,12 +29,12 @@ using System; using OpenMetaverse; namespace OpenSim.Region.Framework.Interfaces -{ +{ public interface ISoundModule { void PlayAttachedSound(UUID soundID, UUID ownerID, UUID objectID, double gain, Vector3 position, byte flags); void TriggerSound( - UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle); + UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle); } } \ No newline at end of file diff --git a/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs index 344601f..403d542 100644 --- a/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs @@ -29,7 +29,7 @@ using OpenMetaverse; using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.Framework.Interfaces -{ +{ public interface IVegetationModule : IEntityCreator { /// @@ -44,6 +44,6 @@ namespace OpenSim.Region.Framework.Interfaces /// /// SceneObjectGroup AddTree( - UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree); + UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree); } } diff --git a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs index a0b0888..de1bcd4 100644 --- a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs @@ -26,9 +26,9 @@ */ namespace OpenSim.Region.Framework.Interfaces -{ +{ public interface IWorldMapModule { - void LazySaveGeneratedMaptile(byte[] data, bool temporary); + void LazySaveGeneratedMaptile(byte[] data, bool temporary); } } diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs index 7ac1e7e..5b571c7 100644 --- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs @@ -34,7 +34,7 @@ using OpenMetaverse; using OpenSim.Framework; namespace OpenSim.Region.Framework.Scenes -{ +{ class DeleteToInventoryHolder { public DeRezAction action; @@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes /// up the main client thread. /// public class AsyncSceneObjectGroupDeleter - { + { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -58,16 +58,16 @@ namespace OpenSim.Region.Framework.Scenes /// public bool Enabled; - private Timer m_inventoryTicker = new Timer(2000); - private readonly Queue m_inventoryDeletes = new Queue(); - private Scene m_scene; + private Timer m_inventoryTicker = new Timer(2000); + private readonly Queue m_inventoryDeletes = new Queue(); + private Scene m_scene; public AsyncSceneObjectGroupDeleter(Scene scene) { m_scene = scene; m_inventoryTicker.AutoReset = false; - m_inventoryTicker.Elapsed += InventoryRunDeleteTimer; + m_inventoryTicker.Elapsed += InventoryRunDeleteTimer; } /// @@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Scenes { //m_log.Debug("[SCENE]: Sent item successfully to inventory, continuing..."); } - } + } /// /// Move the next object in the queue to inventory. Then delete it properly from the scene. @@ -121,7 +121,7 @@ namespace OpenSim.Region.Framework.Scenes /// public bool InventoryDeQueueAndDelete() { - DeleteToInventoryHolder x = null; + DeleteToInventoryHolder x = null; try { @@ -142,9 +142,9 @@ namespace OpenSim.Region.Framework.Scenes try { - m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient); + m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient); if (x.permissionToDelete) - m_scene.DeleteSceneObject(x.objectGroup, false); + m_scene.DeleteSceneObject(x.objectGroup, false); } catch (Exception e) { @@ -166,6 +166,6 @@ namespace OpenSim.Region.Framework.Scenes m_log.Debug("[SCENE]: No objects left in inventory send queue."); return false; - } + } } } diff --git a/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs index 06b1d22..72d599a 100644 --- a/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs +++ b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs @@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Scenes { if (nod.Attributes["name"] != null) { - string name = (string)nod.Attributes["name"].Value; + string name = (string)nod.Attributes["name"].Value; UUID id = (UUID)nod.InnerText; string animState = (string)nod.Attributes["state"].Value; diff --git a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs index 1dd9613..5f2eb0d 100644 --- a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs +++ b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs @@ -234,7 +234,7 @@ namespace OpenSim.Region.Framework.Scenes /// - /// Variable length strings seem to be null terminated in the animation asset.. but.. + /// Variable length strings seem to be null terminated in the animation asset.. but.. /// use with caution, home grown. /// advances the index. /// @@ -273,7 +273,7 @@ namespace OpenSim.Region.Framework.Scenes byte[] interm = new byte[endpos-i]; for (; iZXY t = y; y = z; diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs index 504b90a..0ceef39 100644 --- a/OpenSim/Region/Framework/Scenes/EntityManager.cs +++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs @@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes { m_log.ErrorFormat("Remove Entity failed for {0}", localID, e); return false; - } + } } } diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 7424b24..753344d 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs @@ -290,7 +290,7 @@ namespace OpenSim.Region.Framework.Scenes /// Guid.Empty is returned. /// public delegate void OarFileSaved(Guid guid, string message); - public event OarFileSaved OnOarFileSaved; + public event OarFileSaved OnOarFileSaved; /// /// Called when the script compile queue becomes empty @@ -1004,7 +1004,7 @@ namespace OpenSim.Region.Framework.Scenes handlerOarFileSaved = OnOarFileSaved; if (handlerOarFileSaved != null) handlerOarFileSaved(requestId, message); - } + } public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message) { diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs index 1217f9b..d7e62a8 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs @@ -357,7 +357,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID); m_log.DebugFormat( "[HGSceneCommService]: User {0} is going to another region, profile cache removed", - avatar.UUID); + avatar.UUID); } } else diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs index 7c02f9a..73f918e 100644 --- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs +++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs @@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes public class RegionStatsHandler : IStreamedRequestHandler - { + { private string osRXStatsURI = String.Empty; private string osXStatsURI = String.Empty; //private string osSecret = String.Empty; @@ -87,13 +87,13 @@ namespace OpenSim.Region.Framework.Scenes } public string Path - { + { // This is for the region and is the regionSecret hashed get { return "/" + osRXStatsURI + "/"; } } private string Report() - { + { OSDMap args = new OSDMap(30); //int time = Util.ToUnixTime(DateTime.Now); args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index eb397f6..a4460e4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -1015,7 +1015,7 @@ namespace OpenSim.Region.Framework.Scenes return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId); } else - { + { InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId); if (agentItem == null) diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index fddba86..6c9856d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs @@ -413,7 +413,7 @@ namespace OpenSim.Region.Framework.Scenes remoteClient.SendInventoryItemDetails(ownerID, item); } // else shouldn't we send an alert message? - } + } /// /// Tell the client about the various child items and folders contained in the requested folder. @@ -485,7 +485,7 @@ namespace OpenSim.Region.Framework.Scenes // TODO: This code for looking in the folder for the library should be folded back into the // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc. - // can be handled transparently). + // can be handled transparently). InventoryFolderImpl fold; if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null) { @@ -515,7 +515,7 @@ namespace OpenSim.Region.Framework.Scenes return contents; - } + } /// /// Handle an inventory folder creation request from the client. @@ -535,7 +535,7 @@ namespace OpenSim.Region.Framework.Scenes "[AGENT INVENTORY]: Failed to move create folder for user {0} {1}", remoteClient.Name, remoteClient.AgentId); } - } + } /// /// Handle a client request to update the inventory folder @@ -570,7 +570,7 @@ namespace OpenSim.Region.Framework.Scenes remoteClient.Name, remoteClient.AgentId); } } - } + } public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) { @@ -588,7 +588,7 @@ namespace OpenSim.Region.Framework.Scenes { m_log.WarnFormat("[AGENT INVENTORY]: request to move folder {0} but folder not found", folderID); } - } + } /// /// This should delete all the items and folders in the given directory. @@ -609,7 +609,7 @@ namespace OpenSim.Region.Framework.Scenes { m_log.WarnFormat("[AGENT INVENTORY]: Exception on purge folder for user {0}: {1}", remoteClient.AgentId, e.Message); } - } + } private void PurgeFolderAsync(UUID userID, UUID folderID) diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index 226ec15..d01cef7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs @@ -805,7 +805,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// /// - /// + /// public bool CanCreateObjectInventory(int invType, UUID objectID, UUID userID) { CreateObjectInventoryHandler handler = OnCreateObjectInventory; @@ -856,7 +856,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// /// - /// + /// public bool CanCreateUserInventory(int invType, UUID userID) { CreateUserInventoryHandler handler = OnCreateUserInventory; @@ -877,7 +877,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// /// - /// + /// public bool CanEditUserInventory(UUID itemID, UUID userID) { EditUserInventoryHandler handler = OnEditUserInventory; @@ -891,14 +891,14 @@ namespace OpenSim.Region.Framework.Scenes } } return true; - } + } /// /// Check whether the specified user is allowed to copy the given inventory item from their own inventory. /// /// /// - /// + /// public bool CanCopyUserInventory(UUID itemID, UUID userID) { CopyUserInventoryHandler handler = OnCopyUserInventory; @@ -912,14 +912,14 @@ namespace OpenSim.Region.Framework.Scenes } } return true; - } + } /// /// Check whether the specified user is allowed to edit the given inventory item within their own inventory. /// /// /// - /// + /// public bool CanDeleteUserInventory(UUID itemID, UUID userID) { DeleteUserInventoryHandler handler = OnDeleteUserInventory; @@ -933,7 +933,7 @@ namespace OpenSim.Region.Framework.Scenes } } return true; - } + } public bool CanTeleport(UUID userID) { diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 39f3007..f8db354 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -996,7 +996,7 @@ namespace OpenSim.Region.Framework.Scenes // Loop it if (m_frame == Int32.MaxValue) - m_frame = 0; + m_frame = 0; otherMS = Environment.TickCount; // run through all entities looking for updates (slow) @@ -2023,12 +2023,12 @@ namespace OpenSim.Region.Framework.Scenes return true; } break; - case Cardinals.W: + case Cardinals.W: foreach (Border b in WestBorders) { if (b.TestCross(position)) return true; - } + } break; } } @@ -3270,7 +3270,7 @@ namespace OpenSim.Region.Framework.Scenes m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); //reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName); - return false; + return false; } } diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 2af98cc..0ac4ed4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs @@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// Registered classes that are capable of creating entities. /// - protected Dictionary m_entityCreators = new Dictionary(); + protected Dictionary m_entityCreators = new Dictionary(); /// /// The last allocated local prim id. When a new local id is requested, the next number in the sequence is @@ -279,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes _primAllocateMutex.ReleaseMutex(); return myID; - } + } #region Module Methods @@ -473,7 +473,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain. /// - /// What to show + /// What to show public virtual void Show(string[] showParams) { switch (showParams[0]) @@ -489,7 +489,7 @@ namespace OpenSim.Region.Framework.Scenes } break; } - } + } public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback) { diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 0c471aa..54ac792 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -845,7 +845,7 @@ namespace OpenSim.Region.Framework.Scenes ScenePresence sp; lock (ScenePresences) - { + { ScenePresences.TryGetValue(agentID, out sp); } diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 0019b23..1d4efd0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs @@ -192,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes public void SaveCurrentSceneToXml(string filename) { IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface(); - if (serialiser != null) + if (serialiser != null) serialiser.SavePrimsToXml(CurrentOrFirstScene, filename); } @@ -205,7 +205,7 @@ namespace OpenSim.Region.Framework.Scenes public void LoadCurrentSceneFromXml(string filename, bool generateNewIDs, Vector3 loadOffset) { IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface(); - if (serialiser != null) + if (serialiser != null) serialiser.LoadPrimsFromXml(CurrentOrFirstScene, filename, generateNewIDs, loadOffset); } @@ -216,14 +216,14 @@ namespace OpenSim.Region.Framework.Scenes public void SaveCurrentSceneToXml2(string filename) { IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface(); - if (serialiser != null) + if (serialiser != null) serialiser.SavePrimsToXml2(CurrentOrFirstScene, filename); } public void SaveNamedPrimsToXml2(string primName, string filename) { IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface(); - if (serialiser != null) + if (serialiser != null) serialiser.SaveNamedPrimsToXml2(CurrentOrFirstScene, primName, filename); } @@ -233,7 +233,7 @@ namespace OpenSim.Region.Framework.Scenes public void LoadCurrentSceneFromXml2(string filename) { IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface(); - if (serialiser != null) + if (serialiser != null) serialiser.LoadPrimsFromXml2(CurrentOrFirstScene, filename); } @@ -257,7 +257,7 @@ namespace OpenSim.Region.Framework.Scenes public void LoadArchiveToCurrentScene(string filename) { IRegionArchiverModule archiver = CurrentOrFirstScene.RequestModuleInterface(); - if (archiver != null) + if (archiver != null) archiver.DearchiveRegion(filename); } diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index ad5d56f..5c0024f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -263,7 +263,7 @@ namespace OpenSim.Region.Framework.Scenes if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) && !IsAttachmentCheckFull()) - { + { m_scene.CrossPrimGroupIntoNewRegion(val, this, true); } @@ -454,7 +454,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void AttachToScene(Scene scene) { - m_scene = scene; + m_scene = scene; RegionHandle = m_scene.RegionInfo.RegionHandle; if (m_rootPart.Shape.PCode != 9 || m_rootPart.Shape.State == 0) @@ -479,9 +479,9 @@ namespace OpenSim.Region.Framework.Scenes //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); } - ApplyPhysics(m_scene.m_physicalPrim); + ApplyPhysics(m_scene.m_physicalPrim); - ScheduleGroupForFullUpdate(); + ScheduleGroupForFullUpdate(); } public Vector3 GroupScale() @@ -1037,12 +1037,12 @@ namespace OpenSim.Region.Framework.Scenes m_rootPart = part; if (!IsAttachment) part.ParentID = 0; - part.LinkNum = 0; + part.LinkNum = 0; // No locking required since the SOG should not be in the scene yet - one can't change root parts after // the scene object has been attached to the scene m_parts.Add(m_rootPart.UUID, m_rootPart); - } + } /// /// Add a new part to this scene object. The part must already be correctly configured. @@ -1160,7 +1160,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// Delete this group from its scene and tell all the scene presences about that deletion. - /// + /// /// Broadcast deletions to all clients. public void DeleteGroup(bool silent) { @@ -1267,11 +1267,11 @@ namespace OpenSim.Region.Framework.Scenes if (part.LocalId != m_rootPart.LocalId) { part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim); - } - } + } + } // Hack to get the physics scene geometries in the right spot - ResetChildPrimPhysicsPositions(); + ResetChildPrimPhysicsPositions(); } else { @@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Framework.Scenes List partList; lock (m_parts) - { + { partList = new List(m_parts.Values); } @@ -1744,7 +1744,7 @@ namespace OpenSim.Region.Framework.Scenes rootpart.PhysActor.PIDHoverActive = false; } } - } + } } /// diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index cce45fe..c915e9f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -42,7 +42,7 @@ using OpenSim.Region.Framework.Scenes.Scripting; using OpenSim.Region.Physics.Manager; namespace OpenSim.Region.Framework.Scenes -{ +{ #region Enumerations [Flags] @@ -187,7 +187,7 @@ namespace OpenSim.Region.Framework.Scenes public IEntityInventory Inventory { get { return m_inventory; } - } + } protected SceneObjectPartInventory m_inventory; [XmlIgnore] @@ -309,9 +309,9 @@ namespace OpenSim.Region.Framework.Scenes RotationOffset = rotationOffset; Velocity = new Vector3(0, 0, 0); AngularVelocity = new Vector3(0, 0, 0); - Acceleration = new Vector3(0, 0, 0); + Acceleration = new Vector3(0, 0, 0); m_TextureAnimation = new byte[0]; - m_particleSystem = new byte[0]; + m_particleSystem = new byte[0]; // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from @@ -384,7 +384,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes - /// + /// public TaskInventoryDictionary TaskInventory { get { return m_inventory.Items; } @@ -3484,7 +3484,7 @@ if (m_shape != null) { } else // it already has a physical representation { - pa.IsPhysical = UsePhysics; + pa.IsPhysical = UsePhysics; DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim if (m_parentGroup != null) @@ -3775,7 +3775,7 @@ if (m_shape != null) { public override string ToString() { return String.Format("{0} {1} (parent {2}))", Name, UUID, ParentGroup); - } + } #endregion Public Methods @@ -3823,11 +3823,11 @@ if (m_shape != null) { _everyoneMask &= _nextOwnerMask; Inventory.ApplyNextOwnerPermissions(); - } + } public bool CanBeDeleted() { return Inventory.CanBeDeleted(); } - } + } } diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 76bcd7e..098e010 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs @@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes public void ForceInventoryPersistence() { HasInventoryChanged = true; - } + } /// /// Reset UUIDs for all the items in the prim's inventory. This involves either generating @@ -164,7 +164,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// Change every item in this inventory to a new group. /// - /// + /// public void ChangeInventoryGroup(UUID groupID) { lock (Items) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 286b7ca..0e1b8d9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -776,7 +776,7 @@ namespace OpenSim.Region.Framework.Scenes // Moved this from SendInitialData to ensure that m_appearance is initialized // before the inventory is processed in MakeRootAgent. This fixes a race condition // related to the handling of attachments - //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); + //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); if (m_scene.TestBorderCross(pos, Cardinals.E)) { Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); @@ -1235,7 +1235,7 @@ namespace OpenSim.Region.Framework.Scenes if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) { StandUp(); - } + } // Check if Client has camera in 'follow cam' or 'build' mode. Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation); @@ -1489,7 +1489,7 @@ namespace OpenSim.Region.Framework.Scenes { // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); // m_log.DebugFormat( -// "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3); +// "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3); AddNewMovement(agent_control_v3, q); @@ -2306,7 +2306,7 @@ namespace OpenSim.Region.Framework.Scenes /// Rotate the avatar to the given rotation and apply a movement in the given relative vector /// /// The vector in which to move. This is relative to the rotation argument - /// The direction in which this avatar should now face. + /// The direction in which this avatar should now face. public void AddNewMovement(Vector3 vec, Quaternion rotation) { if (m_isChildAgent) @@ -2649,7 +2649,7 @@ namespace OpenSim.Region.Framework.Scenes /// Tell the client for this scene presence what items it should be wearing now /// public void SendWearables() - { + { ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); } @@ -3175,7 +3175,7 @@ namespace OpenSim.Region.Framework.Scenes else { wears[i++] = UUID.Zero; - wears[i++] = UUID.Zero; + wears[i++] = UUID.Zero; } } cAgent.Wearables = wears; @@ -3487,7 +3487,7 @@ namespace OpenSim.Region.Framework.Scenes public bool HasAttachments() { - return m_attachments.Count > 0; + return m_attachments.Count > 0; } public bool HasScriptedAttachments() diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index fe74158..f7544ac 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs @@ -122,13 +122,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization "[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData); return null; } - } + } /// /// Serialize a scene object to the original xml format /// /// - /// + /// public static string ToOriginalXmlFormat(SceneObjectGroup sceneObject) { using (StringWriter sw = new StringWriter()) @@ -140,13 +140,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization return sw.ToString(); } - } + } /// /// Serialize a scene object to the original xml format /// /// - /// + /// public static void ToOriginalXmlFormat(SceneObjectGroup sceneObject, XmlTextWriter writer) { //m_log.DebugFormat("[SERIALIZER]: Starting serialization of {0}", Name); @@ -238,13 +238,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization m_log.ErrorFormat("[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData); return null; } - } + } /// /// Serialize a scene object to the 'xml2' format. /// /// - /// + /// public static string ToXml2Format(SceneObjectGroup sceneObject) { using (StringWriter sw = new StringWriter()) @@ -262,7 +262,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization /// Serialize a scene object to the 'xml2' format. /// /// - /// + /// public static void ToXml2Format(SceneObjectGroup sceneObject, XmlTextWriter writer) { //m_log.DebugFormat("[SERIALIZER]: Starting serialization of SOG {0} to XML2", Name); @@ -288,6 +288,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization writer.WriteEndElement(); // End of SceneObjectGroup //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0} to XML2, {1}ms", Name, System.Environment.TickCount - time); - } + } } } diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs index 7fa1b8c..cf0f345 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs @@ -236,7 +236,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization } SavePrimListToXml2(primList, fileName); - } + } public static void SavePrimListToXml2(List entityList, string fileName) { diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index 7f44bf1..ee288b3 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs @@ -450,7 +450,7 @@ namespace OpenSim.Region.Framework.Scenes { addFrameMS(ms); addAgentMS(ms); - } + } #endregion } diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs index 3b0e77f..fc66c85 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs @@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture, LongRunning] public class EntityManagerTests - { + { static public Random random; SceneObjectGroup found; Scene scene = SceneSetupHelpers.SetupScene(); @@ -81,13 +81,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests Assert.That(entman.ContainsKey(obj1), Is.False); Assert.That(entman.ContainsKey(li1), Is.False); - Assert.That(entman.ContainsKey(obj2), Is.False); - Assert.That(entman.ContainsKey(li2), Is.False); + Assert.That(entman.ContainsKey(obj2), Is.False); + Assert.That(entman.ContainsKey(li2), Is.False); } [Test] public void T011_ThreadAddRemoveTest() - { + { TestHelper.InMethod(); // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); @@ -148,12 +148,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests int size = random.Next(40,80); char ch ; for (int i=0; i [TestFixture] public class SceneObjectBasicTests - { + { /// /// Test adding an object to a scene. /// [Test, LongRunning] public void TestAddSceneObject() - { + { TestHelper.InMethod(); Scene scene = SceneSetupHelpers.SetupScene(); @@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests //m_log.Debug("retrievedPart : {0}", retrievedPart); // If the parts have the same UUID then we will consider them as one and the same - Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); + Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); } /// @@ -72,11 +72,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests { TestHelper.InMethod(); - TestScene scene = SceneSetupHelpers.SetupScene(); + TestScene scene = SceneSetupHelpers.SetupScene(); SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); scene.DeleteSceneObject(part.ParentGroup, false); - SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); + SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); Assert.That(retrievedPart, Is.Null); } @@ -115,13 +115,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests //[Test] //public void TestDeleteSceneObjectAsyncToUserInventory() //{ - // TestHelper.InMethod(); - // //log4net.Config.XmlConfigurator.Configure(); + // TestHelper.InMethod(); + // //log4net.Config.XmlConfigurator.Configure(); // UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); // string myObjectName = "Fred"; - // TestScene scene = SceneSetupHelpers.SetupScene(); + // TestScene scene = SceneSetupHelpers.SetupScene(); // SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene, myObjectName); // Assert.That( diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs index bf13607..e15dc84 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs @@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests /// /// Linking tests /// - [TestFixture] + [TestFixture] public class SceneObjectLinkingTests { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -174,13 +174,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests // Link grp4 to grp3. grp3.LinkToGroup(grp4); - // At this point we should have 4 parts total in two groups. + // At this point we should have 4 parts total in two groups. Assert.That(grp1.Children.Count == 2); Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link."); - Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink."); + Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink."); Assert.That(grp3.Children.Count == 2); Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link."); - Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink."); + Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink."); if (debugtest) { @@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.Rotation); m_log.Debug("Group3: Prim1: OffsetPosition:"+part3.OffsetPosition+", OffsetRotation:"+part3.RotationOffset); m_log.Debug("Group3: Prim2: OffsetPosition:"+part4.OffsetPosition+", OffsetRotation:"+part4.RotationOffset); - } + } // Required for linking grp1.RootPart.UpdateFlag = 0; @@ -253,6 +253,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003) && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003) && (part4.RotationOffset.W - compareQuaternion.W < 0.00003)); - } + } } } diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs index 1c9bce4..8a27b7b 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs @@ -41,11 +41,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests public class SceneTests { private class FakeStorageManager : StorageManager - { + { private class FakeRegionDataStore : IRegionDataStore { public void Initialise(string filename) - { + { } public void Dispose() diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs index 751c1cd..b46eb8e 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs @@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests { /// /// Teleport tests in a standalone OpenSim - /// + /// [TestFixture] public class StandaloneTeleportTests { @@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests /// /// Does not yet do what is says on the tin. /// Commenting for now - //[Test, LongRunning] + //[Test, LongRunning] public void TestSimpleNotNeighboursTeleport() { TestHelper.InMethod(); diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index f449e18..525a93a 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Scenes { /// /// Gather uuids for a given entity. - /// + /// /// /// This does a deep inspection of the entity to retrieve all the assets it uses (whether as textures, as scripts /// contained in inventory, as scripts contained in objects contained in another object's inventory, etc. Assets @@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// The uuid of the asset for which to gather referenced assets /// The type of the asset for the uuid given - /// The assets gathered + /// The assets gathered public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary assetUuids) { assetUuids[assetUuid] = 1; @@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes // If the prim is a sculpt then preserve this information too if (part.Shape.SculptTexture != UUID.Zero) - assetUuids[part.Shape.SculptTexture] = 1; + assetUuids[part.Shape.SculptTexture] = 1; TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); @@ -167,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// The callback made when we request the asset for an object from the asset service. - /// + /// protected void AssetReceived(string id, Object sender, AssetBase asset) { lock (this) @@ -242,7 +242,7 @@ namespace OpenSim.Region.Framework.Scenes AssetBase assetBase = GetAsset(wearableAssetUuid); if (null != assetBase) - { + { //m_log.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data)); AssetWearable wearableAsset = new AssetBodypart(wearableAssetUuid, assetBase.Data); wearableAsset.Decode(); @@ -275,6 +275,6 @@ namespace OpenSim.Region.Framework.Scenes SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); GatherAssetUuids(sog, assetUuids); } - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 4a2d7b5..605645b 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs @@ -601,7 +601,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server if (names.Length > 1) return names[1]; return names[0]; - } + } } public IScene Scene diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs index c49d942..773507c 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs @@ -351,7 +351,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat { m_log.DebugFormat("[IRC-Region {0}] dropping message {1} on channel {2}", Region, msg, msg.Channel); return; - } + } ScenePresence avatar = null; string fromName = msg.From; diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs index 9ba09ed..46ad30f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs @@ -97,8 +97,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice ", Context, Realm); } - return response; - } + return response; + } } } diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs index 5d90a8f..df6e0e7 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs @@ -138,7 +138,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice response["str_response_string"] = ""; } } - return response; + return response; } private Hashtable HandleRegister(string Context, string Realm, Hashtable request) @@ -309,17 +309,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice "\r\n", domain, Context); - return response; - } + return response; + } // private Hashtable HandleLoadNetworkLists(Hashtable request) // { // m_log.Info("[FreeSwitchDirectory] HandleLoadNetworkLists called"); -// +// // // TODO the password we return needs to match that sent in the request, this is hard coded for now // string domain = (string) request["domain"]; -// +// // Hashtable response = new Hashtable(); // response["content_type"] = "text/xml"; // response["keepalive"] = false; @@ -340,9 +340,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice // "\r\n" + // "\r\n", // domain); -// -// -// return response; -// } +// +// +// return response; +// } } } diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index febb491..cb76200 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs @@ -226,7 +226,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice m_log.DebugFormat("[VivoxVoice] plugin initialization failed: {0}", e.ToString()); return; } - } + } // Called to indicate that the module has been added to the region @@ -1144,7 +1144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice // Otherwise prepare the request m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl); - HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl); + HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl); HttpWebResponse rsp = null; // We are sending just parameters, no content diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index d5cbfd4..9ce4e1a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs @@ -477,7 +477,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups foreach (string key in binBucketOSD.Keys) { m_log.WarnFormat("{0}: {1}", key, binBucketOSD[key].ToString()); - } + } } // treat as if no attachment diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs index b5da6f7..7202601 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs @@ -208,7 +208,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened m_log.ErrorFormat( "[CONTENT MANAGEMENT]: Content management thread terminating with exception. PLEASE REBOOT YOUR SIM - CONTENT MANAGEMENT WILL NOT BE AVAILABLE UNTIL YOU DO. Exception is {0}", - e); + e); } } diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs index 52c4e03..0dc78c0 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs @@ -102,7 +102,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement { if (m_MetaEntityCollection.Auras.ContainsKey(((SceneObjectPart)missingPart).UUID)) continue; - newList.Add(m_MetaEntityCollection.CreateAuraForNewlyCreatedEntity((SceneObjectPart)missingPart)); + newList.Add(m_MetaEntityCollection.CreateAuraForNewlyCreatedEntity((SceneObjectPart)missingPart)); } m_log.Info("Number of missing objects found: " + newList.Count); return newList; diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index bf523dd..ce50f9e 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs @@ -136,7 +136,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule /// /// AppDomain with a restricted security policy /// Substantial portions of this function from: http://blogs.msdn.com/shawnfa/archive/2004/10/25/247379.aspx - /// Valid permissionSetName values are: + /// Valid permissionSetName values are: /// * FullTrust /// * SkipVerification /// * Execution diff --git a/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs index c539280..fc1c608 100644 --- a/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs +++ b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs @@ -117,7 +117,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser public void LoadRegion(Scene scene) { IRegionSerialiserModule serialiser = scene.RequestModuleInterface(); - if (serialiser != null) + if (serialiser != null) { serialiser.LoadPrimsFromXml2( scene, diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs index e0f856a..18d4bab 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs @@ -528,7 +528,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin { // Teravus: Kitto, this code causes recurring errors that stall physics permenantly unless // the values are checked, so checking below. - // Is there any reason that we don't do this in ScenePresence? + // Is there any reason that we don't do this in ScenePresence? // The only physics engine that benefits from it in the physics plugin is this one if (x > (int)Constants.RegionSize || y > (int)Constants.RegionSize || @@ -650,7 +650,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin if (iPropertiesNotSupportedDefault == 0) { -#if SPAM +#if SPAM m_log.Warn("NonMesh"); #endif return false; diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index ce52744..7130a3e 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs @@ -55,7 +55,7 @@ namespace OpenSim.Region.Physics.Manager plugHard = new ZeroMesherPlugin(); _MeshPlugins.Add(plugHard.GetName(), plugHard); - m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); + m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); } /// diff --git a/OpenSim/Region/Physics/Manager/VehicleConstants.cs b/OpenSim/Region/Physics/Manager/VehicleConstants.cs index 97f66d3..532e55e 100644 --- a/OpenSim/Region/Physics/Manager/VehicleConstants.cs +++ b/OpenSim/Region/Physics/Manager/VehicleConstants.cs @@ -93,7 +93,7 @@ namespace OpenSim.Region.Physics.Manager BANKING_TIMESCALE = 40, REFERENCE_FRAME = 44 - } + } [Flags] public enum VehicleFlag diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs index d9f4951..c8ae229 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs @@ -228,7 +228,7 @@ namespace OpenSim.Region.Physics.OdePlugin mono [0x81d28b6] mono [0x81ea2c6] /lib/i686/cmov/libpthread.so.0 [0xb7e744c0] - /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de] + /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de] */ // Exclude heightfield geom diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 94223d8..0769c90 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -2536,7 +2536,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (iPropertiesNotSupportedDefault == 0) { -#if SPAM +#if SPAM m_log.Warn("NonMesh"); #endif return false; @@ -3334,7 +3334,7 @@ namespace OpenSim.Region.Physics.OdePlugin { // this._heightmap[i] = (double)heightMap[i]; // dbm (danx0r) -- creating a buffer zone of one extra sample all around - //_origheightmap = heightMap; + //_origheightmap = heightMap; float[] _heightmap; @@ -3520,16 +3520,16 @@ namespace OpenSim.Region.Physics.OdePlugin d.GeomDestroy(g); //removingHeightField = new float[0]; - } + } } } else { m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data."); } - } + } } - } + } public override void SetWaterLevel(float baseheight) { diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs index 569009e..0feb967 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs @@ -225,7 +225,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened m_log.ErrorFormat( "[{0}]: Event queue thread terminating with exception. PLEASE REBOOT YOUR SIM - SCRIPT EVENTS WILL NOT WORK UNTIL YOU DO. Exception is {1}", - ScriptEngineName, e); + ScriptEngineName, e); } } diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 8ad916c..3c91b29 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs @@ -418,7 +418,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine { InstanceData id = m_ScriptManager.GetScript(localID, itemID); if (id == null) - return; + return; if (!id.Disabled) id.Running = true; @@ -428,7 +428,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine { InstanceData id = m_ScriptManager.GetScript(localID, itemID); if (id == null) - return; + return; id.Running = false; } @@ -442,7 +442,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine InstanceData id = m_ScriptManager.GetScript(localID, itemID); if (id == null) - return; + return; IEventQueue eq = World.RequestModuleInterface(); if (eq == null) diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 9c1cd4d..6ac209e 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs @@ -520,13 +520,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine ExeStage = 5; // ;^) Ewe Loon, for debuging } catch (Exception e) // ;^) Ewe Loon, From here down tis fix - { + { if ((ExeStage == 3)&&(qParams.Length>0)) detparms.Remove(id); SceneObjectPart ob = m_scriptEngine.World.GetSceneObjectPart(localID); m_log.InfoFormat("[Script Error] ,{0},{1},@{2},{3},{4},{5}", ob.Name , FunctionName, ExeStage, e.Message, qParams.Length, detparms.Count); if (ExeStage != 2) throw e; - } + } } public uint GetLocalID(UUID itemID) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index d0df390..8dcb1f5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase return m_OSSL_Functions.osWindActiveModelPluginName(); } -// Not yet plugged in as available OSSL functions, so commented out +// Not yet plugged in as available OSSL functions, so commented out // void osWindParamSet(string plugin, string param, float value) // { // m_OSSL_Functions.osWindParamSet(plugin, param, value); @@ -329,7 +329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase public string osGetSimulatorVersion() { - return m_OSSL_Functions.osGetSimulatorVersion(); + return m_OSSL_Functions.osGetSimulatorVersion(); } public Hashtable osParseJSON(string JSON) diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 650d9fa..97166cf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs @@ -261,7 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance "SecondLife.Script"); //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); - RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); + RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); // lease.Register(this); } catch (Exception) @@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance permsGranter = part.TaskInventory[m_ItemID].PermsGranter; permsMask = part.TaskInventory[m_ItemID].PermsMask; - } + } if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) { @@ -630,7 +630,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance /// /// Process the next event queued for this script /// - /// + /// public object EventProcessor() { lock (m_Script) @@ -925,7 +925,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance public override string ToString() { - return String.Format("{0} {1} on {2}", m_ScriptName, m_ItemID, m_PrimName); + return String.Format("{0} {1} on {2}", m_ScriptName, m_ItemID, m_PrimName); } string FormatException(Exception e) diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 9a972c2..e695133 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -554,7 +554,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine // We must look for the part outside the m_Scripts lock because GetSceneObjectPart later triggers the // m_parts lock on SOG. At the same time, a scene object that is being deleted will take the m_parts lock - // and then later on try to take the m_scripts lock in this class when it calls OnRemoveScript() + // and then later on try to take the m_scripts lock in this class when it calls OnRemoveScript() SceneObjectPart part = m_Scene.GetSceneObjectPart(localID); if (part == null) { @@ -562,7 +562,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n"; m_ScriptFailCount++; return false; - } + } TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID); if (item == null) @@ -692,7 +692,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine AppDomain.CreateDomain( m_Scene.RegionInfo.RegionID.ToString(), evidence, appSetup); -/* +/* PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel(); AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition(); PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet"); @@ -925,7 +925,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine return new XWorkItem(m_ThreadPool.QueueWorkItem( new WorkItemCallback(this.ProcessEventHandler), parms)); - } + } /// /// Process a previously posted script event. diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs index 519668a..a03cc4c 100644 --- a/OpenSim/Region/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs @@ -76,7 +76,7 @@ namespace OpenSim.Region.UserStatistics try { cnfg = config.Configs["WebStats"]; - enabled = cnfg.GetBoolean("enabled", false); + enabled = cnfg.GetBoolean("enabled", false); } catch (Exception) { @@ -137,7 +137,7 @@ namespace OpenSim.Region.UserStatistics m_simstatsCounters.Add(scene.RegionInfo.RegionID, new USimStatsData(scene.RegionInfo.RegionID)); scene.StatsReporter.OnSendStatsResult += ReceiveClassicSimStatsPacket; - } + } } public void ReceiveClassicSimStatsPacket(SimStats stats) -- cgit v1.1 From 606e831ff5337fb5e94dcebf9d6852bd4c434d4b Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 09:38:36 +0900 Subject: Formatting cleanup. --- OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | 2 +- OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs | 2 +- OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs | 6 +++--- OpenSim/Region/ClientStack/RegionApplicationBase.cs | 4 ++-- OpenSim/Region/ClientStack/ThrottleSettings.cs | 2 +- OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | 2 +- .../Avatar/Inventory/Archiver/InventoryArchiveUtils.cs | 4 ++-- .../Avatar/Inventory/Transfer/InventoryTransferModule.cs | 2 +- OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 2 +- OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 +- OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | 2 +- OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs | 2 +- OpenSim/Region/Framework/Interfaces/IDialogModule.cs | 4 ++-- OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | 2 +- OpenSim/Region/Framework/Scenes/Border.cs | 8 ++++---- OpenSim/Region/Framework/Scenes/EntityBase.cs | 2 +- OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 2 +- OpenSim/Region/Framework/Scenes/Scene.cs | 2 +- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 +++--- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +- OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | 2 +- .../Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs | 2 +- .../Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 2 +- .../OptionalModules/World/TreePopulator/TreePopulatorModule.cs | 2 +- OpenSim/Region/Physics/Manager/PhysicsScene.cs | 4 ++-- 26 files changed, 37 insertions(+), 37 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs index 0f16fd4..70d94e7 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs @@ -114,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP sessionInfo = circuitManager.AuthenticateSession(sessionId, agentId, circuitCode); if (!sessionInfo.Authorised) - return false; + return false; return true; } diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs index 26174e5..52effc5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs @@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public int Min { get { return m_minAllowableThrottle; } - } + } public int Current { diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs index 32c0397..daab84f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs @@ -233,7 +233,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests TestLLPacketServer testLLPacketServer; AgentCircuitManager acm; SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); - AddClient(myCircuitCode, testEp, testLLUDPServer, acm); + AddClient(myCircuitCode, testEp, testLLUDPServer, acm); byte[] data = new byte[] { 0x01, 0x02, 0x03, 0x04 }; @@ -252,7 +252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "helloooo"), testEp); testLLUDPServer.ReceiveData(null); - Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1)); + Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1)); Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(1)); } @@ -292,7 +292,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA)); - Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3)); + Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3)); Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); } } diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index bfce7b1..c7aeca14 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -80,7 +80,7 @@ namespace OpenSim.Region.ClientStack /// /// /// - /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. + /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. /// /// protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier); @@ -121,7 +121,7 @@ namespace OpenSim.Region.ClientStack /// The name of the mesh engine to use /// The configuration data to pass to the physics and mesh engines /// - /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. + /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. /// /// protected PhysicsScene GetPhysicsScene( diff --git a/OpenSim/Region/ClientStack/ThrottleSettings.cs b/OpenSim/Region/ClientStack/ThrottleSettings.cs index 551dbdf..fe4718c 100644 --- a/OpenSim/Region/ClientStack/ThrottleSettings.cs +++ b/OpenSim/Region/ClientStack/ThrottleSettings.cs @@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack /// /// Maximum bytes per second that the throttle can be set to. /// - public int Max; + public int Max; /// /// Current bytes per second that the throttle should be set to. diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index 413c6e8..ebebaf9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs @@ -185,7 +185,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog m_log.InfoFormat( "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", - m_scene.RegionInfo.RegionName, firstName, lastName, message); + m_scene.RegionInfo.RegionName, firstName, lastName, message); SendAlertToUser(firstName, lastName, message, false); } } diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs index a73f868..a822d10 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs @@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// User id to search /// /// - /// The path to the required folder. + /// The path to the required folder. /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned. /// /// null if the folder is not found @@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// The folder from which the path starts /// /// - /// The path to the required folder. + /// The path to the required folder. /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned. /// /// null if the folder is not found diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 734230c..d9a021f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs @@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer byte[] copyIDBytes = copyID.GetBytes(); im.binaryBucket = new byte[1 + copyIDBytes.Length]; im.binaryBucket[0] = (byte)AssetType.Folder; - Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length); + Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length); if (user != null && !user.IsChildAgent) { diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index d9f377b..05d19a2 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs @@ -508,7 +508,7 @@ namespace OpenSim.Region.CoreModules.World.Land scene.WestBorders[0].TriggerRegionY = conn.RegionScene.RegionInfo.RegionLocY; } - /* + /* else { conn.RegionScene.NorthBorders[0].BorderLine.Z += (int)Constants.RegionSize; diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index b09c7a1..a9e0b7f 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions //private uint PERM_MODIFY = (uint)16384; private uint PERM_MOVE = (uint)524288; private uint PERM_TRANS = (uint)8192; - private uint PERM_LOCKED = (uint)540672; + private uint PERM_LOCKED = (uint)540672; /// /// Different user set names that come in from the configuration file. diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 796b382..37f1f2e 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs @@ -90,6 +90,6 @@ namespace OpenSim.Region.CoreModules.World.Sound p.ControllingClient.SendTriggeredSound( soundId, ownerID, objectID, parentID, handle, position, (float)gain); } - } + } } } diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs index dcfb5a6..9d47e19 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs @@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins private float m_avgStrength = 5.0f; // Average magnitude of the wind vector private float m_avgDirection = 0.0f; // Average direction of the wind in degrees - private float m_varStrength = 5.0f; // Max Strength Variance + private float m_varStrength = 5.0f; // Max Strength Variance private float m_varDirection = 30.0f;// Max Direction Variance private float m_rateChange = 1.0f; // diff --git a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs index d1c37da..ce57c44 100644 --- a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs @@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Interfaces void SendAlertToUser(string firstName, string lastName, string message, bool modal); /// - /// Send an alert message to all users in the scene. + /// Send an alert message to all users in the scene. /// /// void SendGeneralAlert(string message); @@ -129,7 +129,7 @@ namespace OpenSim.Region.Framework.Interfaces /// /// The user sending the message /// The name of the user doing the sending - /// The message being sent to the user + /// The message being sent to the user void SendNotificationToUsersInEstate(UUID fromAvatarID, string fromAvatarName, string message); } } diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs index fa64333..9ad2036 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs @@ -52,7 +52,7 @@ namespace OpenSim.Region.Framework.Interfaces /// This method occurs asynchronously. If you want notification of when it has completed then subscribe to /// the EventManager.OnOarFileSaved event. /// - /// + /// /// If supplied, this request Id is later returned in the saved event void ArchiveRegion(string savePath, Guid requestId); diff --git a/OpenSim/Region/Framework/Scenes/Border.cs b/OpenSim/Region/Framework/Scenes/Border.cs index 1488c5b..c6a6511 100644 --- a/OpenSim/Region/Framework/Scenes/Border.cs +++ b/OpenSim/Region/Framework/Scenes/Border.cs @@ -55,11 +55,11 @@ namespace OpenSim.Region.Framework.Scenes /// Creates a Border. The line is perpendicular to the direction cardinal. /// IE: if the direction cardinal is South, the line is West->East /// - /// The starting point for the line of the border. - /// The position of an object must be greater then this for this border to trigger. + /// The starting point for the line of the border. + /// The position of an object must be greater then this for this border to trigger. /// Perpendicular to the direction cardinal - /// The ending point for the line of the border. - /// The position of an object must be less then this for this border to trigger. + /// The ending point for the line of the border. + /// The position of an object must be less then this for this border to trigger. /// Perpendicular to the direction cardinal /// The position that triggers border the border /// cross parallel to the direction cardinal. On the North cardinal, this diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs index 00c99c5..c2ec6a5 100644 --- a/OpenSim/Region/Framework/Scenes/EntityBase.cs +++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs @@ -130,7 +130,7 @@ namespace OpenSim.Region.Framework.Scenes public abstract void UpdateMovement(); /// - /// Performs any updates that need to be done at each frame, as opposed to immediately. + /// Performs any updates that need to be done at each frame, as opposed to immediately. /// These included scheduled updates and updates that occur due to physics processing. /// public abstract void Update(); diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 6c9856d..e561efb 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs @@ -544,7 +544,7 @@ namespace OpenSim.Region.Framework.Scenes /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE /// so this will work to rename an existing folder. Needless to say, to rely on this is very confusing, /// and needs to be changed. - /// + /// /// /// /// diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f8db354..05a6f13 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -3419,7 +3419,7 @@ namespace OpenSim.Region.Framework.Scenes /// We've got an update about an agent that sees into this region, /// send it to ScenePresence for processing It's the full data. /// - /// Agent that contains all of the relevant things about an agent. + /// Agent that contains all of the relevant things about an agent. /// Appearance, animations, position, etc. /// true if we handled it. public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 5c0024f..25489d8 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -133,7 +133,7 @@ namespace OpenSim.Region.Framework.Scenes /// Is this scene object acting as an attachment? /// /// We return false if the group has already been deleted. - /// + /// /// TODO: At the moment set must be done on the part itself. There may be a case for doing it here since I /// presume either all or no parts in a linkset can be part of an attachment (in which /// case the value would get proprogated down into all the descendent parts). diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c915e9f..ea6bc9c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes public UUID FromItemID = UUID.Zero; /// - /// The UUID of the user inventory item from which this object was rezzed if this is a root part. + /// The UUID of the user inventory item from which this object was rezzed if this is a root part. /// If UUID.Zero then either this is not a root part or there is no connection with a user inventory item. /// private UUID m_fromUserInventoryItemID = UUID.Zero; @@ -363,7 +363,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// A relic from when we we thought that prims contained folder objects. In - /// reality, prim == folder + /// reality, prim == folder /// Exposing this is not particularly good, but it's one of the least evils at the moment to see /// folder id from prim inventory item data, since it's not (yet) actually stored with the prim. /// @@ -3386,7 +3386,7 @@ if (m_shape != null) { } else { - IsPhantom = false; + IsPhantom = false; // If volumedetect is active we don't want phantom to be applied. // If this is a new call to VD out of the state "phantom" // this will also cause the prim to be visible to physics diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 0e1b8d9..66fefa3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2313,7 +2313,7 @@ namespace OpenSim.Region.Framework.Scenes { m_log.Debug("DEBUG: AddNewMovement: child agent, Making root agent!"); - // we have to reset the user's child agent connections. + // we have to reset the user's child agent connections. // Likely, here they've lost the eventqueue for other regions so border // crossings will fail at this point unless we reset them. diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index 288fb36..0ed00de 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs @@ -127,7 +127,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests // Assert.That( // scene.CommsManager.UserAdminService.AddUser( // "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId), - // Is.EqualTo(agentId)); + // Is.EqualTo(agentId)); // IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId); diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs index df6e0e7..17cdf74 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs @@ -93,7 +93,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice { response = HandleRegister(Context, Realm, request); } - else if (sipAuthMethod == "INVITE") + else if (sipAuthMethod == "INVITE") { response = HandleInvite(Context, Realm, request); } diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 9ce4e1a..2e89a24 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs @@ -1261,7 +1261,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups { if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); - // TODO: Probably isn't nessesary to update every client in every scene. + // TODO: Probably isn't nessesary to update every client in every scene. // Need to examine client updates and do only what's nessesary. lock (m_sceneList) { diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs index d4bba10..3044b17 100644 --- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs @@ -92,7 +92,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator this.m_maximum_scale = cp.m_maximum_scale; this.m_initial_scale = cp.m_initial_scale; this.m_rate = cp.m_rate; - this.m_planted = planted; + this.m_planted = planted; this.m_trees = new List(); } diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 8a07f71..6dd26bb 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs @@ -178,12 +178,12 @@ namespace OpenSim.Region.Physics.Manager } /// - /// Queue a raycast against the physics scene. + /// Queue a raycast against the physics scene. /// The provided callback method will be called when the raycast is complete /// /// Many physics engines don't support collision testing at the same time as /// manipulating the physics scene, so we queue the request up and callback - /// a custom method when the raycast is complete. + /// a custom method when the raycast is complete. /// This allows physics engines that give an immediate result to callback immediately /// and ones that don't, to callback when it gets a result back. /// -- cgit v1.1 From 8e3dd64282495e8f7b18efcb2a2e57218a3db6ad Mon Sep 17 00:00:00 2001 From: James J Greensky Date: Wed, 30 Sep 2009 16:52:59 -0700 Subject: Removed an innefficent List.Contains lookup from UpdateQueue Changed the underlying data structure used to detected duplicate in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a List to a Dictionary. --- OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs index 21cda09..213e954 100644 --- a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs +++ b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs @@ -38,7 +38,7 @@ namespace OpenSim.Region.Framework.Scenes.Types { private Queue m_queue; - private List m_ids; + private Dictionary m_ids; private object m_syncObject = new object(); @@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Types public UpdateQueue() { m_queue = new Queue(); - m_ids = new List(); + m_ids = new Dictionary(); } public void Clear() @@ -66,9 +66,8 @@ namespace OpenSim.Region.Framework.Scenes.Types { lock (m_syncObject) { - if (!m_ids.Contains(part.UUID)) - { - m_ids.Add(part.UUID); + if (!m_ids.ContainsKey(part.UUID)) { + m_ids.Add(part.UUID, true); m_queue.Enqueue(part); } } -- cgit v1.1