aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionCommsListener.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-04-29 14:04:55 +0000
committerAdam Frisby2008-04-29 14:04:55 +0000
commit375163a6fece8b3a57c7555246abe8338223a599 (patch)
tree163001ca96a4b4d08589e9772f78510677d5d0dc /OpenSim/Framework/RegionCommsListener.cs
parentPatch from Melanie: 0001087: Crash to bash de-linking objects. Thanks Melanie! (diff)
downloadopensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.zip
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.gz
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.bz2
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.xz
* Spring cleaning.
* Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.
Diffstat (limited to 'OpenSim/Framework/RegionCommsListener.cs')
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs33
1 files changed, 17 insertions, 16 deletions
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 73971ac..422c939 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -33,6 +33,21 @@ namespace OpenSim.Framework
33{ 33{
34 public class RegionCommsListener : IRegionCommsListener 34 public class RegionCommsListener : IRegionCommsListener
35 { 35 {
36 public string debugRegionName = String.Empty;
37 private AcknowledgeAgentCross handlerAcknowledgeAgentCrossed = null; // OnAcknowledgeAgentCrossed;
38 private AcknowledgePrimCross handlerAcknowledgePrimCrossed = null; // OnAcknowledgePrimCrossed;
39 private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
40 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
41 private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
42 private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent;
43 private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim;
44 private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser
45 private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
46 private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
47 private RegionUp handlerRegionUp = null; // OnRegionUp;
48
49 #region IRegionCommsListener Members
50
36 public event ExpectUserDelegate OnExpectUser; 51 public event ExpectUserDelegate OnExpectUser;
37 public event ExpectPrimDelegate OnExpectPrim; 52 public event ExpectPrimDelegate OnExpectPrim;
38 public event GenericCall2 OnExpectChildAgent; 53 public event GenericCall2 OnExpectChildAgent;
@@ -45,20 +60,7 @@ namespace OpenSim.Framework
45 public event RegionUp OnRegionUp; 60 public event RegionUp OnRegionUp;
46 public event ChildAgentUpdate OnChildAgentUpdate; 61 public event ChildAgentUpdate OnChildAgentUpdate;
47 62
48 private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser 63 #endregion
49 private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim;
50 private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent;
51 private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
52 private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
53 private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
54 private AcknowledgeAgentCross handlerAcknowledgeAgentCrossed = null; // OnAcknowledgeAgentCrossed;
55 private AcknowledgePrimCross handlerAcknowledgePrimCrossed = null; // OnAcknowledgePrimCrossed;
56 private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
57 private RegionUp handlerRegionUp = null; // OnRegionUp;
58 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
59
60 public string debugRegionName = String.Empty;
61
62 64
63 /// <summary> 65 /// <summary>
64 /// 66 ///
@@ -164,7 +166,6 @@ namespace OpenSim.Framework
164 { 166 {
165 handlerCloseAgentConnection(regionHandle, agentID); 167 handlerCloseAgentConnection(regionHandle, agentID);
166 return true; 168 return true;
167
168 } 169 }
169 return false; 170 return false;
170 } 171 }
@@ -213,4 +214,4 @@ namespace OpenSim.Framework
213 return false; 214 return false;
214 } 215 }
215 } 216 }
216} 217} \ No newline at end of file