aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/IInterRegionCommunications.cs1
-rw-r--r--OpenSim/Framework/IRegionCommsListener.cs4
-rw-r--r--OpenSim/Framework/IScene.cs5
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs12
4 files changed, 19 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
index 94e4cf7..c64abb5 100644
--- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -33,6 +33,7 @@ namespace OpenSim.Framework.Communications
33 { 33 {
34 bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData); 34 bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
35 bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData); 35 bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData);
36 bool RegionUp(RegionInfo region);
36 37
37 bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); 38 bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying);
38 bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isFlying); 39 bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isFlying);
diff --git a/OpenSim/Framework/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs
index c9fc525..53d0059 100644
--- a/OpenSim/Framework/IRegionCommsListener.cs
+++ b/OpenSim/Framework/IRegionCommsListener.cs
@@ -46,6 +46,8 @@ namespace OpenSim.Framework
46 46
47 public delegate void CloseAgentConnection(ulong regionHandle, LLUUID agentID); 47 public delegate void CloseAgentConnection(ulong regionHandle, LLUUID agentID);
48 48
49 public delegate bool RegionUp(RegionInfo region);
50
49 51
50 52
51 public interface IRegionCommsListener 53 public interface IRegionCommsListener
@@ -59,5 +61,7 @@ namespace OpenSim.Framework
59 event AcknowledgePrimCross OnAcknowledgePrimCrossed; 61 event AcknowledgePrimCross OnAcknowledgePrimCrossed;
60 event UpdateNeighbours OnNeighboursUpdate; 62 event UpdateNeighbours OnNeighboursUpdate;
61 event CloseAgentConnection OnCloseAgentConnection; 63 event CloseAgentConnection OnCloseAgentConnection;
64 event RegionUp OnRegionUp;
65
62 } 66 }
63} \ No newline at end of file 67} \ No newline at end of file
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 0e4d260..5507500 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -30,7 +30,7 @@ using libsecondlife;
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
32 public delegate void restart( RegionInfo thisRegion ); 32 public delegate void restart( RegionInfo thisRegion );
33 public delegate void regionup ( RegionInfo thisRegion ); 33 //public delegate void regionup ( RegionInfo thisRegion );
34 34
35 public enum RegionStatus : int 35 public enum RegionStatus : int
36 { 36 {
@@ -43,13 +43,12 @@ namespace OpenSim.Framework
43 public interface IScene 43 public interface IScene
44 { 44 {
45 event restart OnRestart; 45 event restart OnRestart;
46 event regionup OnRegionUp;
47 46
48 void AddNewClient(IClientAPI client, bool child); 47 void AddNewClient(IClientAPI client, bool child);
49 void RemoveClient(LLUUID agentID); 48 void RemoveClient(LLUUID agentID);
50 49
51 void Restart(int seconds); 50 void Restart(int seconds);
52 void OtherRegionUp(RegionInfo thisRegion); 51 bool OtherRegionUp(RegionInfo thisRegion);
53 52
54 RegionInfo RegionInfo { get; } 53 RegionInfo RegionInfo { get; }
55 uint NextLocalId { get; } 54 uint NextLocalId { get; }
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 5dc9b81..449c073 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -42,6 +42,8 @@ namespace OpenSim.Framework
42 public event AcknowledgeAgentCross OnAcknowledgeAgentCrossed; 42 public event AcknowledgeAgentCross OnAcknowledgeAgentCrossed;
43 public event AcknowledgePrimCross OnAcknowledgePrimCrossed; 43 public event AcknowledgePrimCross OnAcknowledgePrimCrossed;
44 public event CloseAgentConnection OnCloseAgentConnection; 44 public event CloseAgentConnection OnCloseAgentConnection;
45 public event RegionUp OnRegionUp;
46
45 47
46 /// <summary> 48 /// <summary>
47 /// 49 ///
@@ -68,6 +70,16 @@ namespace OpenSim.Framework
68 return false; 70 return false;
69 } 71 }
70 72
73 public virtual bool TriggerRegionUp(RegionInfo region)
74 {
75 if (OnRegionUp != null)
76 {
77 OnRegionUp(region);
78 return true;
79 }
80 return false;
81 }
82
71 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, 83 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position,
72 bool isFlying) 84 bool isFlying)
73 { 85 {