From 606e831ff5337fb5e94dcebf9d6852bd4c434d4b Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 09:38:36 +0900 Subject: [PATCH] Formatting cleanup. --- OpenSim/Data/IUserData.cs | 2 +- OpenSim/Data/Tests/BasicRegionTest.cs | 2 +- OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 2 +- .../Communications/Cache/UserProfileCacheService.cs | 4 ++-- OpenSim/Framework/Communications/IUserService.cs | 2 +- .../Communications/TemporaryUserProfilePlugin.cs | 2 +- OpenSim/Framework/InventoryFolderImpl.cs | 2 +- .../Serialization/External/LandDataSerializer.cs | 2 +- OpenSim/Framework/Servers/VersionInfo.cs | 2 +- OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | 2 +- OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs | 2 +- .../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 +- .../Region/CoreModules/World/Land/RegionCombinerModule.cs | 2 +- .../CoreModules/World/Permissions/PermissionsModule.cs | 2 +- OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | 2 +- .../CoreModules/World/Wind/Plugins/ConfigurableWind.cs | 2 +- OpenSim/Region/Framework/Interfaces/IDialogModule.cs | 4 ++-- .../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 +- .../Framework/Scenes/Tests/SceneObjectBasicTests.cs | 2 +- .../Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs | 2 +- .../OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 2 +- .../World/TreePopulator/TreePopulatorModule.cs | 2 +- OpenSim/Region/Physics/Manager/PhysicsScene.cs | 4 ++-- OpenSim/Server/Base/ProtocolVersions.cs | 2 +- 36 files changed, 48 insertions(+), 48 deletions(-) diff --git a/OpenSim/Data/IUserData.cs b/OpenSim/Data/IUserData.cs index ee6936605a..e9a1e81616 100644 --- a/OpenSim/Data/IUserData.cs +++ b/OpenSim/Data/IUserData.cs @@ -54,7 +54,7 @@ namespace OpenSim.Data /// /// Get a user from a given uri. - /// + /// /// /// The user data profile. Null if no user is found. UserProfileData GetUserByUri(Uri uri); diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs index ca1fcfab0b..97990e1b72 100644 --- a/OpenSim/Data/Tests/BasicRegionTest.cs +++ b/OpenSim/Data/Tests/BasicRegionTest.cs @@ -497,7 +497,7 @@ namespace OpenSim.Data.Tests Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next()); Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next()); Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next()); - Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next()); + Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next()); sop.GroupPosition = groupos; sop.RotationOffset = rotoff; diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 8c39ca8fba..aa71536c6c 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs @@ -219,7 +219,7 @@ namespace OpenSim.Framework.Communications.Cache /// /// Fetch inventory for this user. /// - /// This has to be executed as a separate step once user information is retreived. + /// This has to be executed as a separate step once user information is retreived. /// This will occur synchronously if the inventory service is in the same process as this class, and /// asynchronously otherwise. public void FetchInventory() diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 2a1da50c66..9e12d94849 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs @@ -123,7 +123,7 @@ namespace OpenSim.Framework.Communications.Cache /// /// Get details of the given user. /// - /// If the user isn't in cache then the user is requested from the profile service. + /// If the user isn't in cache then the user is requested from the profile service. /// /// null if no user details are found public CachedUserInfo GetUserDetails(string fname, string lname) @@ -151,7 +151,7 @@ namespace OpenSim.Framework.Communications.Cache /// /// Get details of the given user. /// - /// If the user isn't in cache then the user is requested from the profile service. + /// If the user isn't in cache then the user is requested from the profile service. /// /// null if no user details are found public CachedUserInfo GetUserDetails(UUID userID) diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs index 2872e5efbb..dfa059d929 100644 --- a/OpenSim/Framework/Communications/IUserService.cs +++ b/OpenSim/Framework/Communications/IUserService.cs @@ -128,7 +128,7 @@ namespace OpenSim.Framework.Communications /// /// The agent for whom we're retreiving the friends Data. /// - /// A List of FriendListItems that contains info about the user's friends. + /// A List of FriendListItems that contains info about the user's friends. /// Always returns a list even if the user has no friends /// List GetUserFriendList(UUID friendlistowner); diff --git a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs index d56211f414..2413055542 100644 --- a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs +++ b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs @@ -35,7 +35,7 @@ using OpenSim.Data; namespace OpenSim.Framework.Communications { /// - /// Plugin for managing temporary user profiles. + /// Plugin for managing temporary user profiles. /// public class TemporaryUserProfilePlugin : IUserDataPlugin { diff --git a/OpenSim/Framework/InventoryFolderImpl.cs b/OpenSim/Framework/InventoryFolderImpl.cs index 6b432f3911..29c7682c2b 100644 --- a/OpenSim/Framework/InventoryFolderImpl.cs +++ b/OpenSim/Framework/InventoryFolderImpl.cs @@ -314,7 +314,7 @@ namespace OpenSim.Framework /// FIXME: Delimitors which occur in names themselves are not currently escapable. /// /// - /// 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/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs index 6bfae4185f..4376249767 100644 --- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs +++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs @@ -155,7 +155,7 @@ namespace OpenSim.Framework.Serialization.External xtw.WriteElementString("OwnerID", landData.OwnerID.ToString()); xtw.WriteStartElement("ParcelAccessList"); - foreach(ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList) + foreach (ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList) { xtw.WriteStartElement("ParcelAccessEntry"); xtw.WriteElementString("AgentID", pal.AgentID.ToString()); diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 8900e46afe..9f98310282 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs @@ -56,7 +56,7 @@ namespace OpenSim public const int VERSIONINFO_VERSION_LENGTH = 27; /// - /// This is the external interface version. It is separate from the OpenSimulator project version. + /// This is the external interface version. It is separate from the OpenSimulator project version. /// /// This version number should be /// increased by 1 every time a code change makes the previous OpenSimulator revision incompatible diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs index 0f16fd447b..70d94e7777 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 26174e51ed..52effc5b6c 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 32c03973bd..daab84f423 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 bfce7b1b6d..c7aeca14e3 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 551dbdfd51..fe4718cec8 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 413c6e8bb5..ebebaf9e65 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 a73f868891..a822d104cc 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 734230c84e..d9a021fc02 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 d9f377b84c..05d19a2c4a 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 b09c7a1925..a9e0b7fd76 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 796b3825e0..37f1f2eb9f 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 dcfb5a6e84..9d47e19439 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 d1c37daed5..ce57c44202 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 fa64333a65..9ad2036ff1 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 1488c5b61f..c6a6511046 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 00c99c5bbc..c2ec6a5c6e 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 6c9856d5b4..e561efbff0 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 f8db354c3d..05a6f13b34 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 5c0024f118..25489d8d45 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 c915e9f041..ea6bc9c319 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 0e1b8d9ee6..66fefa3dff 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 288fb363ee..0ed00de366 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 df6e0e7084..17cdf741b5 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 9ce4e1aa87..2e89a24a14 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 d4bba1009d..3044b17286 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 8a07f712c3..6dd26bb663 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. /// diff --git a/OpenSim/Server/Base/ProtocolVersions.cs b/OpenSim/Server/Base/ProtocolVersions.cs index 488a9e6b19..8db5bb69d8 100644 --- a/OpenSim/Server/Base/ProtocolVersions.cs +++ b/OpenSim/Server/Base/ProtocolVersions.cs @@ -30,7 +30,7 @@ namespace OpenSim.Server.Base public class ProtocolVersions { /// - /// This is the external protocol versions. It is separate from the OpenSimulator project version. + /// This is the external protocol versions. It is separate from the OpenSimulator project version. /// /// These version numbers should be increased by 1 every time a code /// change in the Service.Connectors and Server.Handlers, espectively,