diff options
author | Jeff Ames | 2009-10-01 09:38:36 +0900 |
---|---|---|
committer | Jeff Ames | 2009-10-01 09:38:36 +0900 |
commit | 606e831ff5337fb5e94dcebf9d6852bd4c434d4b (patch) | |
tree | bf53bcf7f7087b8595e4fdd43c705e1247e00102 /OpenSim/Region/Framework/Scenes | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-606e831ff5337fb5e94dcebf9d6852bd4c434d4b.zip opensim-SC_OLD-606e831ff5337fb5e94dcebf9d6852bd4c434d4b.tar.gz opensim-SC_OLD-606e831ff5337fb5e94dcebf9d6852bd4c434d4b.tar.bz2 opensim-SC_OLD-606e831ff5337fb5e94dcebf9d6852bd4c434d4b.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
8 files changed, 13 insertions, 13 deletions
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 | |||
55 | /// Creates a Border. The line is perpendicular to the direction cardinal. | 55 | /// Creates a Border. The line is perpendicular to the direction cardinal. |
56 | /// IE: if the direction cardinal is South, the line is West->East | 56 | /// IE: if the direction cardinal is South, the line is West->East |
57 | /// </summary> | 57 | /// </summary> |
58 | /// <param name="lineStart">The starting point for the line of the border. | 58 | /// <param name="lineStart">The starting point for the line of the border. |
59 | /// The position of an object must be greater then this for this border to trigger. | 59 | /// The position of an object must be greater then this for this border to trigger. |
60 | /// Perpendicular to the direction cardinal</param> | 60 | /// Perpendicular to the direction cardinal</param> |
61 | /// <param name="lineEnd">The ending point for the line of the border. | 61 | /// <param name="lineEnd">The ending point for the line of the border. |
62 | /// The position of an object must be less then this for this border to trigger. | 62 | /// The position of an object must be less then this for this border to trigger. |
63 | /// Perpendicular to the direction cardinal</param> | 63 | /// Perpendicular to the direction cardinal</param> |
64 | /// <param name="triggerCoordinate">The position that triggers border the border | 64 | /// <param name="triggerCoordinate">The position that triggers border the border |
65 | /// cross parallel to the direction cardinal. On the North cardinal, this | 65 | /// 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 | |||
130 | public abstract void UpdateMovement(); | 130 | public abstract void UpdateMovement(); |
131 | 131 | ||
132 | /// <summary> | 132 | /// <summary> |
133 | /// Performs any updates that need to be done at each frame, as opposed to immediately. | 133 | /// Performs any updates that need to be done at each frame, as opposed to immediately. |
134 | /// These included scheduled updates and updates that occur due to physics processing. | 134 | /// These included scheduled updates and updates that occur due to physics processing. |
135 | /// </summary> | 135 | /// </summary> |
136 | public abstract void Update(); | 136 | 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 | |||
544 | /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE | 544 | /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE |
545 | /// so this will work to rename an existing folder. Needless to say, to rely on this is very confusing, | 545 | /// so this will work to rename an existing folder. Needless to say, to rely on this is very confusing, |
546 | /// and needs to be changed. | 546 | /// and needs to be changed. |
547 | /// | 547 | /// |
548 | /// <param name="remoteClient"></param> | 548 | /// <param name="remoteClient"></param> |
549 | /// <param name="folderID"></param> | 549 | /// <param name="folderID"></param> |
550 | /// <param name="type"></param> | 550 | /// <param name="type"></param> |
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 | |||
3419 | /// We've got an update about an agent that sees into this region, | 3419 | /// We've got an update about an agent that sees into this region, |
3420 | /// send it to ScenePresence for processing It's the full data. | 3420 | /// send it to ScenePresence for processing It's the full data. |
3421 | /// </summary> | 3421 | /// </summary> |
3422 | /// <param name="cAgentData">Agent that contains all of the relevant things about an agent. | 3422 | /// <param name="cAgentData">Agent that contains all of the relevant things about an agent. |
3423 | /// Appearance, animations, position, etc.</param> | 3423 | /// Appearance, animations, position, etc.</param> |
3424 | /// <returns>true if we handled it.</returns> | 3424 | /// <returns>true if we handled it.</returns> |
3425 | public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData) | 3425 | 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 | |||
133 | /// Is this scene object acting as an attachment? | 133 | /// Is this scene object acting as an attachment? |
134 | /// | 134 | /// |
135 | /// We return false if the group has already been deleted. | 135 | /// We return false if the group has already been deleted. |
136 | /// | 136 | /// |
137 | /// TODO: At the moment set must be done on the part itself. There may be a case for doing it here since I | 137 | /// TODO: At the moment set must be done on the part itself. There may be a case for doing it here since I |
138 | /// presume either all or no parts in a linkset can be part of an attachment (in which | 138 | /// presume either all or no parts in a linkset can be part of an attachment (in which |
139 | /// case the value would get proprogated down into all the descendent parts). | 139 | /// 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 | |||
142 | public UUID FromItemID = UUID.Zero; | 142 | public UUID FromItemID = UUID.Zero; |
143 | 143 | ||
144 | /// <value> | 144 | /// <value> |
145 | /// The UUID of the user inventory item from which this object was rezzed if this is a root part. | 145 | /// The UUID of the user inventory item from which this object was rezzed if this is a root part. |
146 | /// If UUID.Zero then either this is not a root part or there is no connection with a user inventory item. | 146 | /// If UUID.Zero then either this is not a root part or there is no connection with a user inventory item. |
147 | /// </value> | 147 | /// </value> |
148 | private UUID m_fromUserInventoryItemID = UUID.Zero; | 148 | private UUID m_fromUserInventoryItemID = UUID.Zero; |
@@ -363,7 +363,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
363 | 363 | ||
364 | /// <summary> | 364 | /// <summary> |
365 | /// A relic from when we we thought that prims contained folder objects. In | 365 | /// A relic from when we we thought that prims contained folder objects. In |
366 | /// reality, prim == folder | 366 | /// reality, prim == folder |
367 | /// Exposing this is not particularly good, but it's one of the least evils at the moment to see | 367 | /// Exposing this is not particularly good, but it's one of the least evils at the moment to see |
368 | /// folder id from prim inventory item data, since it's not (yet) actually stored with the prim. | 368 | /// folder id from prim inventory item data, since it's not (yet) actually stored with the prim. |
369 | /// </summary> | 369 | /// </summary> |
@@ -3386,7 +3386,7 @@ if (m_shape != null) { | |||
3386 | } | 3386 | } |
3387 | else | 3387 | else |
3388 | { | 3388 | { |
3389 | IsPhantom = false; | 3389 | IsPhantom = false; |
3390 | // If volumedetect is active we don't want phantom to be applied. | 3390 | // If volumedetect is active we don't want phantom to be applied. |
3391 | // If this is a new call to VD out of the state "phantom" | 3391 | // If this is a new call to VD out of the state "phantom" |
3392 | // this will also cause the prim to be visible to physics | 3392 | // 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 | |||
2313 | { | 2313 | { |
2314 | m_log.Debug("DEBUG: AddNewMovement: child agent, Making root agent!"); | 2314 | m_log.Debug("DEBUG: AddNewMovement: child agent, Making root agent!"); |
2315 | 2315 | ||
2316 | // we have to reset the user's child agent connections. | 2316 | // we have to reset the user's child agent connections. |
2317 | // Likely, here they've lost the eventqueue for other regions so border | 2317 | // Likely, here they've lost the eventqueue for other regions so border |
2318 | // crossings will fail at this point unless we reset them. | 2318 | // crossings will fail at this point unless we reset them. |
2319 | 2319 | ||
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 | |||
127 | // Assert.That( | 127 | // Assert.That( |
128 | // scene.CommsManager.UserAdminService.AddUser( | 128 | // scene.CommsManager.UserAdminService.AddUser( |
129 | // "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId), | 129 | // "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId), |
130 | // Is.EqualTo(agentId)); | 130 | // Is.EqualTo(agentId)); |
131 | 131 | ||
132 | // IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId); | 132 | // IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId); |
133 | 133 | ||