diff options
author | John Hurliman | 2009-09-30 17:51:34 -0700 |
---|---|---|
committer | John Hurliman | 2009-09-30 17:51:34 -0700 |
commit | cb26878f96adf99235709e1460474513d2e38f36 (patch) | |
tree | ba23794b2c24f7c27bd3d1ed878f84d43292d7ee /OpenSim/Region | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-cb26878f96adf99235709e1460474513d2e38f36.zip opensim-SC-cb26878f96adf99235709e1460474513d2e38f36.tar.gz opensim-SC-cb26878f96adf99235709e1460474513d2e38f36.tar.bz2 opensim-SC-cb26878f96adf99235709e1460474513d2e38f36.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
26 files changed, 37 insertions, 37 deletions
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 | |||
114 | sessionInfo = circuitManager.AuthenticateSession(sessionId, agentId, circuitCode); | 114 | sessionInfo = circuitManager.AuthenticateSession(sessionId, agentId, circuitCode); |
115 | 115 | ||
116 | if (!sessionInfo.Authorised) | 116 | if (!sessionInfo.Authorised) |
117 | return false; | 117 | return false; |
118 | 118 | ||
119 | return true; | 119 | return true; |
120 | } | 120 | } |
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 | |||
49 | public int Min | 49 | public int Min |
50 | { | 50 | { |
51 | get { return m_minAllowableThrottle; } | 51 | get { return m_minAllowableThrottle; } |
52 | } | 52 | } |
53 | 53 | ||
54 | public int Current | 54 | public int Current |
55 | { | 55 | { |
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 | |||
233 | TestLLPacketServer testLLPacketServer; | 233 | TestLLPacketServer testLLPacketServer; |
234 | AgentCircuitManager acm; | 234 | AgentCircuitManager acm; |
235 | SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); | 235 | SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); |
236 | AddClient(myCircuitCode, testEp, testLLUDPServer, acm); | 236 | AddClient(myCircuitCode, testEp, testLLUDPServer, acm); |
237 | 237 | ||
238 | byte[] data = new byte[] { 0x01, 0x02, 0x03, 0x04 }; | 238 | byte[] data = new byte[] { 0x01, 0x02, 0x03, 0x04 }; |
239 | 239 | ||
@@ -252,7 +252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
252 | testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "helloooo"), testEp); | 252 | testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "helloooo"), testEp); |
253 | testLLUDPServer.ReceiveData(null); | 253 | testLLUDPServer.ReceiveData(null); |
254 | 254 | ||
255 | Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1)); | 255 | Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1)); |
256 | Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(1)); | 256 | Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(1)); |
257 | } | 257 | } |
258 | 258 | ||
@@ -292,7 +292,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
292 | 292 | ||
293 | Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA)); | 293 | Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA)); |
294 | 294 | ||
295 | Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3)); | 295 | Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3)); |
296 | Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); | 296 | Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); |
297 | } | 297 | } |
298 | } | 298 | } |
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 | |||
80 | /// </summary> | 80 | /// </summary> |
81 | /// | 81 | /// |
82 | /// <param name="osSceneIdentifier"> | 82 | /// <param name="osSceneIdentifier"> |
83 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. | 83 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. |
84 | /// </param> | 84 | /// </param> |
85 | /// <returns></returns> | 85 | /// <returns></returns> |
86 | protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier); | 86 | protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier); |
@@ -121,7 +121,7 @@ namespace OpenSim.Region.ClientStack | |||
121 | /// <param name="meshEngine">The name of the mesh engine to use</param> | 121 | /// <param name="meshEngine">The name of the mesh engine to use</param> |
122 | /// <param name="config">The configuration data to pass to the physics and mesh engines</param> | 122 | /// <param name="config">The configuration data to pass to the physics and mesh engines</param> |
123 | /// <param name="osSceneIdentifier"> | 123 | /// <param name="osSceneIdentifier"> |
124 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. | 124 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. |
125 | /// </param> | 125 | /// </param> |
126 | /// <returns></returns> | 126 | /// <returns></returns> |
127 | protected PhysicsScene GetPhysicsScene( | 127 | 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 | |||
40 | /// <summary> | 40 | /// <summary> |
41 | /// Maximum bytes per second that the throttle can be set to. | 41 | /// Maximum bytes per second that the throttle can be set to. |
42 | /// </summary> | 42 | /// </summary> |
43 | public int Max; | 43 | public int Max; |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Current bytes per second that the throttle should be set to. | 46 | /// 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 | |||
185 | 185 | ||
186 | m_log.InfoFormat( | 186 | m_log.InfoFormat( |
187 | "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", | 187 | "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", |
188 | m_scene.RegionInfo.RegionName, firstName, lastName, message); | 188 | m_scene.RegionInfo.RegionName, firstName, lastName, message); |
189 | SendAlertToUser(firstName, lastName, message, false); | 189 | SendAlertToUser(firstName, lastName, message, false); |
190 | } | 190 | } |
191 | } | 191 | } |
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 | |||
58 | /// User id to search | 58 | /// User id to search |
59 | /// </param> | 59 | /// </param> |
60 | /// <param name="path"> | 60 | /// <param name="path"> |
61 | /// The path to the required folder. | 61 | /// The path to the required folder. |
62 | /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned. | 62 | /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned. |
63 | /// </param> | 63 | /// </param> |
64 | /// <returns>null if the folder is not found</returns> | 64 | /// <returns>null if the folder is not found</returns> |
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
91 | /// The folder from which the path starts | 91 | /// The folder from which the path starts |
92 | /// </param> | 92 | /// </param> |
93 | /// <param name="path"> | 93 | /// <param name="path"> |
94 | /// The path to the required folder. | 94 | /// The path to the required folder. |
95 | /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned. | 95 | /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned. |
96 | /// </param> | 96 | /// </param> |
97 | /// <returns>null if the folder is not found</returns> | 97 | /// <returns>null if the folder is not found</returns> |
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 | |||
169 | byte[] copyIDBytes = copyID.GetBytes(); | 169 | byte[] copyIDBytes = copyID.GetBytes(); |
170 | im.binaryBucket = new byte[1 + copyIDBytes.Length]; | 170 | im.binaryBucket = new byte[1 + copyIDBytes.Length]; |
171 | im.binaryBucket[0] = (byte)AssetType.Folder; | 171 | im.binaryBucket[0] = (byte)AssetType.Folder; |
172 | Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length); | 172 | Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length); |
173 | 173 | ||
174 | if (user != null && !user.IsChildAgent) | 174 | if (user != null && !user.IsChildAgent) |
175 | { | 175 | { |
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 | |||
508 | scene.WestBorders[0].TriggerRegionY = conn.RegionScene.RegionInfo.RegionLocY; | 508 | scene.WestBorders[0].TriggerRegionY = conn.RegionScene.RegionInfo.RegionLocY; |
509 | } | 509 | } |
510 | 510 | ||
511 | /* | 511 | /* |
512 | else | 512 | else |
513 | { | 513 | { |
514 | conn.RegionScene.NorthBorders[0].BorderLine.Z += (int)Constants.RegionSize; | 514 | 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 | |||
103 | //private uint PERM_MODIFY = (uint)16384; | 103 | //private uint PERM_MODIFY = (uint)16384; |
104 | private uint PERM_MOVE = (uint)524288; | 104 | private uint PERM_MOVE = (uint)524288; |
105 | private uint PERM_TRANS = (uint)8192; | 105 | private uint PERM_TRANS = (uint)8192; |
106 | private uint PERM_LOCKED = (uint)540672; | 106 | private uint PERM_LOCKED = (uint)540672; |
107 | 107 | ||
108 | /// <value> | 108 | /// <value> |
109 | /// Different user set names that come in from the configuration file. | 109 | /// 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 | |||
90 | p.ControllingClient.SendTriggeredSound( | 90 | p.ControllingClient.SendTriggeredSound( |
91 | soundId, ownerID, objectID, parentID, handle, position, (float)gain); | 91 | soundId, ownerID, objectID, parentID, handle, position, (float)gain); |
92 | } | 92 | } |
93 | } | 93 | } |
94 | } | 94 | } |
95 | } | 95 | } |
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 | |||
46 | 46 | ||
47 | private float m_avgStrength = 5.0f; // Average magnitude of the wind vector | 47 | private float m_avgStrength = 5.0f; // Average magnitude of the wind vector |
48 | private float m_avgDirection = 0.0f; // Average direction of the wind in degrees | 48 | private float m_avgDirection = 0.0f; // Average direction of the wind in degrees |
49 | private float m_varStrength = 5.0f; // Max Strength Variance | 49 | private float m_varStrength = 5.0f; // Max Strength Variance |
50 | private float m_varDirection = 30.0f;// Max Direction Variance | 50 | private float m_varDirection = 30.0f;// Max Direction Variance |
51 | private float m_rateChange = 1.0f; // | 51 | private float m_rateChange = 1.0f; // |
52 | 52 | ||
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 | |||
73 | void SendAlertToUser(string firstName, string lastName, string message, bool modal); | 73 | void SendAlertToUser(string firstName, string lastName, string message, bool modal); |
74 | 74 | ||
75 | /// <summary> | 75 | /// <summary> |
76 | /// Send an alert message to all users in the scene. | 76 | /// Send an alert message to all users in the scene. |
77 | /// </summary> | 77 | /// </summary> |
78 | /// <param name="message"></param> | 78 | /// <param name="message"></param> |
79 | void SendGeneralAlert(string message); | 79 | void SendGeneralAlert(string message); |
@@ -129,7 +129,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
129 | /// | 129 | /// |
130 | /// <param name="fromAvatarID">The user sending the message</param> | 130 | /// <param name="fromAvatarID">The user sending the message</param> |
131 | /// <param name="fromAvatarName">The name of the user doing the sending</param> | 131 | /// <param name="fromAvatarName">The name of the user doing the sending</param> |
132 | /// <param name="message">The message being sent to the user</param> | 132 | /// <param name="message">The message being sent to the user</param> |
133 | void SendNotificationToUsersInEstate(UUID fromAvatarID, string fromAvatarName, string message); | 133 | void SendNotificationToUsersInEstate(UUID fromAvatarID, string fromAvatarName, string message); |
134 | } | 134 | } |
135 | } | 135 | } |
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 | |||
52 | /// This method occurs asynchronously. If you want notification of when it has completed then subscribe to | 52 | /// This method occurs asynchronously. If you want notification of when it has completed then subscribe to |
53 | /// the EventManager.OnOarFileSaved event. | 53 | /// the EventManager.OnOarFileSaved event. |
54 | /// | 54 | /// |
55 | /// <param name="savePath"></param> | 55 | /// <param name="savePath"></param> |
56 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> | 56 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> |
57 | void ArchiveRegion(string savePath, Guid requestId); | 57 | void ArchiveRegion(string savePath, Guid requestId); |
58 | 58 | ||
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 3ef4144..27a0785 100644 --- a/OpenSim/Region/Framework/Scenes/EntityBase.cs +++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs | |||
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
134 | public abstract void UpdateMovement(); | 134 | public abstract void UpdateMovement(); |
135 | 135 | ||
136 | /// <summary> | 136 | /// <summary> |
137 | /// Performs any updates that need to be done at each frame, as opposed to immediately. | 137 | /// Performs any updates that need to be done at each frame, as opposed to immediately. |
138 | /// These included scheduled updates and updates that occur due to physics processing. | 138 | /// These included scheduled updates and updates that occur due to physics processing. |
139 | /// </summary> | 139 | /// </summary> |
140 | public abstract void Update(); | 140 | 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 0d1cb81..0aa587e 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 57b7e70..6807e1b 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 | ||
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 | |||
93 | { | 93 | { |
94 | response = HandleRegister(Context, Realm, request); | 94 | response = HandleRegister(Context, Realm, request); |
95 | } | 95 | } |
96 | else if (sipAuthMethod == "INVITE") | 96 | else if (sipAuthMethod == "INVITE") |
97 | { | 97 | { |
98 | response = HandleInvite(Context, Realm, request); | 98 | response = HandleInvite(Context, Realm, request); |
99 | } | 99 | } |
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 | |||
1261 | { | 1261 | { |
1262 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 1262 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
1263 | 1263 | ||
1264 | // TODO: Probably isn't nessesary to update every client in every scene. | 1264 | // TODO: Probably isn't nessesary to update every client in every scene. |
1265 | // Need to examine client updates and do only what's nessesary. | 1265 | // Need to examine client updates and do only what's nessesary. |
1266 | lock (m_sceneList) | 1266 | lock (m_sceneList) |
1267 | { | 1267 | { |
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 | |||
92 | this.m_maximum_scale = cp.m_maximum_scale; | 92 | this.m_maximum_scale = cp.m_maximum_scale; |
93 | this.m_initial_scale = cp.m_initial_scale; | 93 | this.m_initial_scale = cp.m_initial_scale; |
94 | this.m_rate = cp.m_rate; | 94 | this.m_rate = cp.m_rate; |
95 | this.m_planted = planted; | 95 | this.m_planted = planted; |
96 | this.m_trees = new List<UUID>(); | 96 | this.m_trees = new List<UUID>(); |
97 | } | 97 | } |
98 | 98 | ||
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 | |||
178 | } | 178 | } |
179 | 179 | ||
180 | /// <summary> | 180 | /// <summary> |
181 | /// Queue a raycast against the physics scene. | 181 | /// Queue a raycast against the physics scene. |
182 | /// The provided callback method will be called when the raycast is complete | 182 | /// The provided callback method will be called when the raycast is complete |
183 | /// | 183 | /// |
184 | /// Many physics engines don't support collision testing at the same time as | 184 | /// Many physics engines don't support collision testing at the same time as |
185 | /// manipulating the physics scene, so we queue the request up and callback | 185 | /// manipulating the physics scene, so we queue the request up and callback |
186 | /// a custom method when the raycast is complete. | 186 | /// a custom method when the raycast is complete. |
187 | /// This allows physics engines that give an immediate result to callback immediately | 187 | /// This allows physics engines that give an immediate result to callback immediately |
188 | /// and ones that don't, to callback when it gets a result back. | 188 | /// and ones that don't, to callback when it gets a result back. |
189 | /// | 189 | /// |