aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712007-09-18 08:55:44 +0000
committerlbsa712007-09-18 08:55:44 +0000
commitffb4f97a664e8b80e209ccf0f89ad56a20a401fd (patch)
tree026179a8c09f85d63995078600d0117d67fc044b /OpenSim
parent* Made ClientViewBase abstract (diff)
downloadopensim-SC_OLD-ffb4f97a664e8b80e209ccf0f89ad56a20a401fd.zip
opensim-SC_OLD-ffb4f97a664e8b80e209ccf0f89ad56a20a401fd.tar.gz
opensim-SC_OLD-ffb4f97a664e8b80e209ccf0f89ad56a20a401fd.tar.bz2
opensim-SC_OLD-ffb4f97a664e8b80e209ccf0f89ad56a20a401fd.tar.xz
* Merged ClientViewBase into ClientView for great justice
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.PacketQueue.cs (renamed from OpenSim/Region/ClientStack/ClientViewBase.cs)8
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs1
4 files changed, 5 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
index 965dc40..05c2869 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
@@ -38,7 +38,7 @@ using OpenSim.Region.Environment;
38 38
39namespace OpenSim.Region.ClientStack 39namespace OpenSim.Region.ClientStack
40{ 40{
41 public abstract class ClientViewBase 41 public partial class ClientView
42 { 42 {
43 protected BlockingQueue<QueItem> PacketQueue; 43 protected BlockingQueue<QueItem> PacketQueue;
44 protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>(); 44 protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
@@ -56,8 +56,6 @@ namespace OpenSim.Region.ClientStack
56 56
57 protected PacketServer m_networkServer; 57 protected PacketServer m_networkServer;
58 58
59 protected abstract void ProcessInPacket(Packet Pack);
60
61 protected virtual void ProcessOutPacket(Packet Pack) 59 protected virtual void ProcessOutPacket(Packet Pack)
62 { 60 {
63 // Keep track of when this packet was sent out 61 // Keep track of when this packet was sent out
@@ -300,10 +298,6 @@ namespace OpenSim.Region.ClientStack
300 } 298 }
301 #endregion 299 #endregion
302 300
303 protected abstract void KillThread();
304
305 public abstract void ConnectionClosed();
306
307 #region Nested Classes 301 #region Nested Classes
308 302
309 public class QueItem 303 public class QueItem
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index fe3e82c..80e499b 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.ClientStack
59 } 59 }
60 } 60 }
61 61
62 protected override void ProcessInPacket(Packet Pack) 62 protected void ProcessInPacket(Packet Pack)
63 { 63 {
64 ack_pack(Pack); 64 ack_pack(Pack);
65 65
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 54c9a0d..1d92cca 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.ClientStack
51 /// Handles new client connections 51 /// Handles new client connections
52 /// Constructor takes a single Packet and authenticates everything 52 /// Constructor takes a single Packet and authenticates everything
53 /// </summary> 53 /// </summary>
54 public partial class ClientView : ClientViewBase, IClientAPI 54 public partial class ClientView : IClientAPI
55 { 55 {
56 public static TerrainManager TerrainManager; 56 public static TerrainManager TerrainManager;
57 57
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ClientStack
134 this.ClientThread.Abort(); 134 this.ClientThread.Abort();
135 } 135 }
136 136
137 public override void ConnectionClosed() 137 public void ConnectionClosed()
138 { 138 {
139 clientPingTimer.Stop(); 139 clientPingTimer.Stop();
140 m_clientThreads.Remove(this.CircuitCode); 140 m_clientThreads.Remove(this.CircuitCode);
@@ -315,7 +315,7 @@ namespace OpenSim.Region.ClientStack
315 # endregion 315 # endregion
316 316
317 317
318 protected override void KillThread() 318 protected void KillThread()
319 { 319 {
320 this.ClientThread.Abort(); 320 this.ClientThread.Abort();
321 } 321 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 4a99a80..5655e72 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -135,7 +135,6 @@ namespace OpenSim.Region.Environment.Scenes
135 else 135 else
136 { 136 {
137 Console.WriteLine("Searching for Region: '" + regionName + "'"); 137 Console.WriteLine("Searching for Region: '" + regionName + "'");
138 Scene foundScene = null;
139 138
140 foreach (Scene scene in m_localScenes) 139 foreach (Scene scene in m_localScenes)
141 { 140 {