* Merged ClientViewBase into ClientView for great justice

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;
 
 namespace OpenSim.Region.ClientStack
 {
-    public abstract class ClientViewBase 
+    public partial class ClientView 
     {
         protected BlockingQueue<QueItem> PacketQueue;
         protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
@@ -56,8 +56,6 @@ namespace OpenSim.Region.ClientStack
 
         protected PacketServer m_networkServer;
 
-        protected abstract void ProcessInPacket(Packet Pack);
-
         protected virtual void ProcessOutPacket(Packet Pack)
         {
             // Keep track of when this packet was sent out
@@ -300,10 +298,6 @@ namespace OpenSim.Region.ClientStack
         }
         #endregion
 
-        protected abstract void KillThread();
-
-        public abstract void ConnectionClosed();
-
         #region Nested Classes
 
         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
             }
         }
 
-        protected override void ProcessInPacket(Packet Pack)
+        protected void ProcessInPacket(Packet Pack)
         {
             ack_pack(Pack);
 
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
     /// Handles new client connections
     /// Constructor takes a single Packet and authenticates everything
     /// </summary>
-    public partial class ClientView : ClientViewBase, IClientAPI
+    public partial class ClientView : IClientAPI
     {
         public static TerrainManager TerrainManager;
 
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ClientStack
             this.ClientThread.Abort();
         }
 
-        public override void ConnectionClosed()
+        public void ConnectionClosed()
         {
             clientPingTimer.Stop();
             m_clientThreads.Remove(this.CircuitCode);
@@ -315,7 +315,7 @@ namespace OpenSim.Region.ClientStack
         # endregion
 
 
-        protected override void KillThread()
+        protected void KillThread()
         {
             this.ClientThread.Abort();
         }
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
             else
             {
                 Console.WriteLine("Searching for Region: '" + regionName + "'");
-                Scene foundScene = null;
 
                 foreach (Scene scene in m_localScenes)
                 {