diff options
author | Jeff Ames | 2008-08-12 00:08:41 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-12 00:08:41 +0000 |
commit | f894f5d87b7f267e56436e687d0285f890a15b60 (patch) | |
tree | 8595e411bb0838fa339f3a16cc6a67ad966395c5 /OpenSim | |
parent | Patch #9163 - Refactor initial packet sending out of InnerScene into (diff) | |
download | opensim-SC-f894f5d87b7f267e56436e687d0285f890a15b60.zip opensim-SC-f894f5d87b7f267e56436e687d0285f890a15b60.tar.gz opensim-SC-f894f5d87b7f267e56436e687d0285f890a15b60.tar.bz2 opensim-SC-f894f5d87b7f267e56436e687d0285f890a15b60.tar.xz |
Minor formatting cleanup.
Diffstat (limited to 'OpenSim')
6 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 59d7858..dd4d804 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
@@ -805,7 +805,7 @@ namespace OpenSim.Data.MySQL | |||
805 | if (hashtable.ContainsKey(folders[i].ID)) | 805 | if (hashtable.ContainsKey(folders[i].ID)) |
806 | folders.AddRange(hashtable[folders[i].ID]); | 806 | folders.AddRange(hashtable[folders[i].ID]); |
807 | } | 807 | } |
808 | } // lock(database) | 808 | } // lock (database) |
809 | return folders; | 809 | return folders; |
810 | } | 810 | } |
811 | catch (Exception e) | 811 | catch (Exception e) |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index f764405..8fe9a7b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | |||
@@ -240,7 +240,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
240 | return; | 240 | return; |
241 | } | 241 | } |
242 | 242 | ||
243 | packet.Header.Sequence = 0; | 243 | packet.Header.Sequence = 0; |
244 | 244 | ||
245 | lock (m_NeedAck) | 245 | lock (m_NeedAck) |
246 | { | 246 | { |
@@ -726,21 +726,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
726 | packet.TickCount = System.Environment.TickCount; | 726 | packet.TickCount = System.Environment.TickCount; |
727 | 727 | ||
728 | // Assign sequence number here to prevent out of order packets | 728 | // Assign sequence number here to prevent out of order packets |
729 | if(packet.Header.Sequence == 0) | 729 | if (packet.Header.Sequence == 0) |
730 | { | 730 | { |
731 | packet.Header.Sequence = NextPacketSequenceNumber(); | 731 | packet.Header.Sequence = NextPacketSequenceNumber(); |
732 | 732 | ||
733 | lock (m_NeedAck) | 733 | lock (m_NeedAck) |
734 | { | 734 | { |
735 | // We want to see that packet arrive if it's reliable | 735 | // We want to see that packet arrive if it's reliable |
736 | if (packet.Header.Reliable) | 736 | if (packet.Header.Reliable) |
737 | { | 737 | { |
738 | m_UnackedBytes += packet.ToBytes().Length; | 738 | m_UnackedBytes += packet.ToBytes().Length; |
739 | m_NeedAck[packet.Header.Sequence] = new AckData(packet, | 739 | m_NeedAck[packet.Header.Sequence] = new AckData(packet, |
740 | item.Identifier); | 740 | item.Identifier); |
741 | } | 741 | } |
742 | } | 742 | } |
743 | } | 743 | } |
744 | 744 | ||
745 | // Actually make the byte array and send it | 745 | // Actually make the byte array and send it |
746 | try | 746 | try |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 1fcda03..1721acb 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -504,12 +504,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
504 | m_pendingObjects = new Queue<SceneObjectGroup>(); | 504 | m_pendingObjects = new Queue<SceneObjectGroup>(); |
505 | 505 | ||
506 | foreach (EntityBase e in m_scene.Entities.Values) | 506 | foreach (EntityBase e in m_scene.Entities.Values) |
507 | if(e is SceneObjectGroup) | 507 | if (e is SceneObjectGroup) |
508 | m_pendingObjects.Enqueue((SceneObjectGroup)e); | 508 | m_pendingObjects.Enqueue((SceneObjectGroup)e); |
509 | } | 509 | } |
510 | } | 510 | } |
511 | 511 | ||
512 | while(m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 60) | 512 | while (m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 60) |
513 | { | 513 | { |
514 | SceneObjectGroup g = m_pendingObjects.Dequeue(); | 514 | SceneObjectGroup g = m_pendingObjects.Dequeue(); |
515 | 515 | ||
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 48fd7f1..440540e 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -3214,7 +3214,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
3214 | { | 3214 | { |
3215 | m_host.AddScriptLPS(1); | 3215 | m_host.AddScriptLPS(1); |
3216 | SceneObjectPart targ = World.GetSceneObjectPart(target); | 3216 | SceneObjectPart targ = World.GetSceneObjectPart(target); |
3217 | if( targ == null ) | 3217 | if (targ == null) |
3218 | return; | 3218 | return; |
3219 | targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); | 3219 | targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); |
3220 | } | 3220 | } |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index 43905a7..dc97174 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | |||
@@ -321,7 +321,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
321 | { | 321 | { |
322 | // ...if it is there. With mono --debug OpenSim.exe, | 322 | // ...if it is there. With mono --debug OpenSim.exe, |
323 | // you'll get the error in the format filename:linenumber | 323 | // you'll get the error in the format filename:linenumber |
324 | if(colon + 6 < t.Length && t.Substring(colon + 1, 5).Equals("line ")) colon += 6; | 324 | if (colon + 6 < t.Length && t.Substring(colon + 1, 5).Equals("line ")) colon += 6; |
325 | else ++colon; // else only skip the colon | 325 | else ++colon; // else only skip the colon |
326 | line = " at line " + Convert.ToInt32(t.Substring(colon)).ToString(); | 326 | line = " at line " + Convert.ToInt32(t.Substring(colon)).ToString(); |
327 | } | 327 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a1f79ae..2612e93 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3156,7 +3156,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3156 | { | 3156 | { |
3157 | m_host.AddScriptLPS(1); | 3157 | m_host.AddScriptLPS(1); |
3158 | SceneObjectPart targ = World.GetSceneObjectPart(target); | 3158 | SceneObjectPart targ = World.GetSceneObjectPart(target); |
3159 | if( targ == null ) | 3159 | if (targ == null) |
3160 | return; | 3160 | return; |
3161 | targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); | 3161 | targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); |
3162 | } | 3162 | } |