Minor formatting / svn properties cleanup.

0.6.0-stable
Jeff Ames 2008-03-25 01:45:23 +00:00
parent dd6e6e7bdf
commit d2b1a8aa1e
3 changed files with 20 additions and 22 deletions

View File

@ -63,7 +63,7 @@ namespace OpenSim.Grid.GridServer
} }
} }
public GridServerBase( ) public GridServerBase()
{ {
m_console = new ConsoleBase("OpenGrid", this); m_console = new ConsoleBase("OpenGrid", this);
MainConsole.Instance = m_console; MainConsole.Instance = m_console;
@ -138,7 +138,6 @@ namespace OpenSim.Grid.GridServer
} }
} }
protected virtual void SetupGridManager() protected virtual void SetupGridManager()
{ {
m_console.Status("[GRID]: Connecting to Storage Server"); m_console.Status("[GRID]: Connecting to Storage Server");

View File

@ -2689,7 +2689,6 @@ namespace OpenSim.Region.ClientStack
{ {
AddAck(Pack); // this adds the need to ack this packet later AddAck(Pack); // this adds the need to ack this packet later
if (Pack.Type != PacketType.PacketAck && Pack.Type != PacketType.LogoutRequest) if (Pack.Type != PacketType.PacketAck && Pack.Type != PacketType.LogoutRequest)
{ {
SetPendingAcks(ref Pack); SetPendingAcks(ref Pack);
@ -2727,7 +2726,7 @@ namespace OpenSim.Region.ClientStack
public virtual void InPacket(Packet NewPack) public virtual void InPacket(Packet NewPack)
{ {
if(!m_packetProcessingEnabled && NewPack.Type != PacketType.LogoutRequest) if (!m_packetProcessingEnabled && NewPack.Type != PacketType.LogoutRequest)
{ {
PacketPool.Instance.ReturnPacket(NewPack); PacketPool.Instance.ReturnPacket(NewPack);
return; return;