OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-08-12 00:08:41 +00:00
parent f9945bf87f
commit f894f5d87b
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/MySQL/MySQLInventoryData.cs
View File

@ -805,7 +805,7 @@ namespace OpenSim.Data.MySQL
if (hashtable.ContainsKey(folders[i].ID)) if (hashtable.ContainsKey(folders[i].ID))
folders.AddRange(hashtable[folders[i].ID]); folders.AddRange(hashtable[folders[i].ID]);
} }
} // lock(database) } // lock (database)
return folders; return folders;
} }
catch (Exception e) catch (Exception e)

30
OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
View File

@ -240,7 +240,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return; return;
} }
packet.Header.Sequence = 0; packet.Header.Sequence = 0;
lock (m_NeedAck) lock (m_NeedAck)
{ {
@ -726,21 +726,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
packet.TickCount = System.Environment.TickCount; packet.TickCount = System.Environment.TickCount;
// Assign sequence number here to prevent out of order packets // Assign sequence number here to prevent out of order packets
if(packet.Header.Sequence == 0) if (packet.Header.Sequence == 0)
{ {
packet.Header.Sequence = NextPacketSequenceNumber(); packet.Header.Sequence = NextPacketSequenceNumber();
lock (m_NeedAck) lock (m_NeedAck)
{ {
// We want to see that packet arrive if it's reliable // We want to see that packet arrive if it's reliable
if (packet.Header.Reliable) if (packet.Header.Reliable)
{ {
m_UnackedBytes += packet.ToBytes().Length; m_UnackedBytes += packet.ToBytes().Length;
m_NeedAck[packet.Header.Sequence] = new AckData(packet, m_NeedAck[packet.Header.Sequence] = new AckData(packet,
item.Identifier); item.Identifier);
} }
} }
} }
// Actually make the byte array and send it // Actually make the byte array and send it
try try

4
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -504,12 +504,12 @@ namespace OpenSim.Region.Environment.Scenes
m_pendingObjects = new Queue<SceneObjectGroup>(); m_pendingObjects = new Queue<SceneObjectGroup>();
foreach (EntityBase e in m_scene.Entities.Values) foreach (EntityBase e in m_scene.Entities.Values)
if(e is SceneObjectGroup) if (e is SceneObjectGroup)
m_pendingObjects.Enqueue((SceneObjectGroup)e); 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(); SceneObjectGroup g = m_pendingObjects.Dequeue();

2
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -3214,7 +3214,7 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
SceneObjectPart targ = World.GetSceneObjectPart(target); SceneObjectPart targ = World.GetSceneObjectPart(target);
if( targ == null ) if (targ == null)
return; return;
targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0);
} }

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
View File

@ -321,7 +321,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
{ {
// ...if it is there. With mono --debug OpenSim.exe, // ...if it is there. With mono --debug OpenSim.exe,
// you'll get the error in the format filename:linenumber // 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 else ++colon; // else only skip the colon
line = " at line " + Convert.ToInt32(t.Substring(colon)).ToString(); line = " at line " + Convert.ToInt32(t.Substring(colon)).ToString();
} }

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -3156,7 +3156,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
SceneObjectPart targ = World.GetSceneObjectPart(target); SceneObjectPart targ = World.GetSceneObjectPart(target);
if( targ == null ) if (targ == null)
return; return;
targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0);
} }