From f894f5d87b7f267e56436e687d0285f890a15b60 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 12 Aug 2008 00:08:41 +0000 Subject: Minor formatting cleanup. --- OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 +- .../ClientStack/LindenUDP/LLPacketHandler.cs | 32 +++++++++++----------- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 4 +-- .../ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 +- .../ScriptEngineBase/EventQueueThreadClass.cs | 2 +- .../Shared/Api/Implementation/LSL_Api.cs | 2 +- 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 if (hashtable.ContainsKey(folders[i].ID)) folders.AddRange(hashtable[folders[i].ID]); } - } // lock(database) + } // lock (database) return folders; } 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 return; } - packet.Header.Sequence = 0; + packet.Header.Sequence = 0; lock (m_NeedAck) { @@ -726,21 +726,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP packet.TickCount = System.Environment.TickCount; // Assign sequence number here to prevent out of order packets - if(packet.Header.Sequence == 0) - { - packet.Header.Sequence = NextPacketSequenceNumber(); - - lock (m_NeedAck) - { - // We want to see that packet arrive if it's reliable - if (packet.Header.Reliable) - { - m_UnackedBytes += packet.ToBytes().Length; - m_NeedAck[packet.Header.Sequence] = new AckData(packet, - item.Identifier); - } - } - } + if (packet.Header.Sequence == 0) + { + packet.Header.Sequence = NextPacketSequenceNumber(); + + lock (m_NeedAck) + { + // We want to see that packet arrive if it's reliable + if (packet.Header.Reliable) + { + m_UnackedBytes += packet.ToBytes().Length; + m_NeedAck[packet.Header.Sequence] = new AckData(packet, + item.Identifier); + } + } + } // Actually make the byte array and send it 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 m_pendingObjects = new Queue(); foreach (EntityBase e in m_scene.Entities.Values) - if(e is SceneObjectGroup) + if (e is SceneObjectGroup) m_pendingObjects.Enqueue((SceneObjectGroup)e); } } - while(m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 60) + while (m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 60) { SceneObjectGroup g = m_pendingObjects.Dequeue(); 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 { m_host.AddScriptLPS(1); SceneObjectPart targ = World.GetSceneObjectPart(target); - if( targ == null ) + if (targ == null) return; targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); } 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 { // ...if it is there. With mono --debug OpenSim.exe, // you'll get the error in the format filename:linenumber - if(colon + 6 < t.Length && t.Substring(colon + 1, 5).Equals("line ")) colon += 6; + if (colon + 6 < t.Length && t.Substring(colon + 1, 5).Equals("line ")) colon += 6; else ++colon; // else only skip the colon line = " at line " + Convert.ToInt32(t.Substring(colon)).ToString(); } 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 { m_host.AddScriptLPS(1); SceneObjectPart targ = World.GetSceneObjectPart(target); - if( targ == null ) + if (targ == null) return; targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); } -- cgit v1.1