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

* Merged ClientViewBase into ClientView for great justice

afrisby
lbsa71 2007-09-18 08:55:44 +00:00
parent 26406efd55
commit ffb4f97a66
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ClientStack/ClientViewBase.cs → OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
View File

@ -38,7 +38,7 @@ using OpenSim.Region.Environment;
namespace OpenSim.Region.ClientStack namespace OpenSim.Region.ClientStack
{ {
public abstract class ClientViewBase public partial class ClientView
{ {
protected BlockingQueue<QueItem> PacketQueue; protected BlockingQueue<QueItem> PacketQueue;
protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>(); protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
@ -56,8 +56,6 @@ namespace OpenSim.Region.ClientStack
protected PacketServer m_networkServer; protected PacketServer m_networkServer;
protected abstract void ProcessInPacket(Packet Pack);
protected virtual void ProcessOutPacket(Packet Pack) protected virtual void ProcessOutPacket(Packet Pack)
{ {
// Keep track of when this packet was sent out // Keep track of when this packet was sent out
@ -300,10 +298,6 @@ namespace OpenSim.Region.ClientStack
} }
#endregion #endregion
protected abstract void KillThread();
public abstract void ConnectionClosed();
#region Nested Classes #region Nested Classes
public class QueItem public class QueItem

2
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Region.ClientStack
} }
} }
protected override void ProcessInPacket(Packet Pack) protected void ProcessInPacket(Packet Pack)
{ {
ack_pack(Pack); ack_pack(Pack);

6
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Region.ClientStack
/// Handles new client connections /// Handles new client connections
/// Constructor takes a single Packet and authenticates everything /// Constructor takes a single Packet and authenticates everything
/// </summary> /// </summary>
public partial class ClientView : ClientViewBase, IClientAPI public partial class ClientView : IClientAPI
{ {
public static TerrainManager TerrainManager; public static TerrainManager TerrainManager;
@ -134,7 +134,7 @@ namespace OpenSim.Region.ClientStack
this.ClientThread.Abort(); this.ClientThread.Abort();
} }
public override void ConnectionClosed() public void ConnectionClosed()
{ {
clientPingTimer.Stop(); clientPingTimer.Stop();
m_clientThreads.Remove(this.CircuitCode); m_clientThreads.Remove(this.CircuitCode);
@ -315,7 +315,7 @@ namespace OpenSim.Region.ClientStack
# endregion # endregion
protected override void KillThread() protected void KillThread()
{ {
this.ClientThread.Abort(); this.ClientThread.Abort();
} }

1
OpenSim/Region/Environment/Scenes/SceneManager.cs
View File

@ -135,7 +135,6 @@ namespace OpenSim.Region.Environment.Scenes
else else
{ {
Console.WriteLine("Searching for Region: '" + regionName + "'"); Console.WriteLine("Searching for Region: '" + regionName + "'");
Scene foundScene = null;
foreach (Scene scene in m_localScenes) foreach (Scene scene in m_localScenes)
{ {