aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-09-18 08:38:21 +0000
committerlbsa712007-09-18 08:38:21 +0000
commit26406efd55aa0e3487bd07786847eed06181bd09 (patch)
treedee70691b70b30a08d9225958c4d71b0d3cded76
parentRemoveAvatar called from scene.cs; implemented in ODE. Still issues with mul... (diff)
downloadopensim-SC-26406efd55aa0e3487bd07786847eed06181bd09.zip
opensim-SC-26406efd55aa0e3487bd07786847eed06181bd09.tar.gz
opensim-SC-26406efd55aa0e3487bd07786847eed06181bd09.tar.bz2
opensim-SC-26406efd55aa0e3487bd07786847eed06181bd09.tar.xz
* Made ClientViewBase abstract
* Deleted unused m_consoleRegion
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientViewBase.cs21
2 files changed, 4 insertions, 19 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 92e3025..1401f6e 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -85,8 +85,6 @@ namespace OpenSim
85 85
86 private string m_assetStorage = "db4o"; 86 private string m_assetStorage = "db4o";
87 87
88 private Scene m_consoleRegion = null;
89
90 public ConsoleCommand CreateAccount = null; 88 public ConsoleCommand CreateAccount = null;
91 89
92 public OpenSimMain(IConfigSource configSource) 90 public OpenSimMain(IConfigSource configSource)
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 80d7e53..965dc40 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -38,7 +38,7 @@ using OpenSim.Region.Environment;
38 38
39namespace OpenSim.Region.ClientStack 39namespace OpenSim.Region.ClientStack
40{ 40{
41 public class ClientViewBase 41 public abstract class ClientViewBase
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,15 +56,7 @@ namespace OpenSim.Region.ClientStack
56 56
57 protected PacketServer m_networkServer; 57 protected PacketServer m_networkServer;
58 58
59 public ClientViewBase() 59 protected abstract void ProcessInPacket(Packet Pack);
60 {
61
62 }
63
64 protected virtual void ProcessInPacket(Packet Pack)
65 {
66
67 }
68 60
69 protected virtual void ProcessOutPacket(Packet Pack) 61 protected virtual void ProcessOutPacket(Packet Pack)
70 { 62 {
@@ -308,14 +300,9 @@ namespace OpenSim.Region.ClientStack
308 } 300 }
309 #endregion 301 #endregion
310 302
311 protected virtual void KillThread() 303 protected abstract void KillThread();
312 {
313
314 }
315 304
316 public virtual void ConnectionClosed() 305 public abstract void ConnectionClosed();
317 {
318 }
319 306
320 #region Nested Classes 307 #region Nested Classes
321 308