diff options
Diffstat (limited to 'OpenSim/Framework')
4 files changed, 19 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index baf24f0..dd7c168 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -175,6 +175,7 @@ namespace OpenSim.Framework.Communications | |||
175 | public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz) | 175 | public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz) |
176 | { | 176 | { |
177 | m_userService.LogOffUser(userid, regionid, regionhandle, posx, posy, posz); | 177 | m_userService.LogOffUser(userid, regionid, regionhandle, posx, posy, posz); |
178 | |||
178 | } | 179 | } |
179 | 180 | ||
180 | /// <summary> | 181 | /// <summary> |
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs index 13ae21f..e93719e 100644 --- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs +++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs | |||
@@ -45,6 +45,6 @@ namespace OpenSim.Framework.Communications | |||
45 | bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId); | 45 | bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId); |
46 | bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID); | 46 | bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID); |
47 | 47 | ||
48 | void TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID); | 48 | bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID); |
49 | } | 49 | } |
50 | } \ No newline at end of file | 50 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs index 19608c8..c8fc9c5 100644 --- a/OpenSim/Framework/IRegionCommsListener.cs +++ b/OpenSim/Framework/IRegionCommsListener.cs | |||
@@ -44,12 +44,14 @@ namespace OpenSim.Framework | |||
44 | 44 | ||
45 | public delegate void AcknowledgePrimCross(ulong regionHandle, LLUUID PrimID); | 45 | public delegate void AcknowledgePrimCross(ulong regionHandle, LLUUID PrimID); |
46 | 46 | ||
47 | public delegate void CloseAgentConnection(ulong regionHandle, LLUUID agentID); | 47 | public delegate bool CloseAgentConnection(ulong regionHandle, LLUUID agentID); |
48 | 48 | ||
49 | public delegate bool RegionUp(RegionInfo region); | 49 | public delegate bool RegionUp(RegionInfo region); |
50 | 50 | ||
51 | public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); | 51 | public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); |
52 | 52 | ||
53 | |||
54 | |||
53 | 55 | ||
54 | public interface IRegionCommsListener | 56 | public interface IRegionCommsListener |
55 | { | 57 | { |
@@ -64,5 +66,6 @@ namespace OpenSim.Framework | |||
64 | event CloseAgentConnection OnCloseAgentConnection; | 66 | event CloseAgentConnection OnCloseAgentConnection; |
65 | event RegionUp OnRegionUp; | 67 | event RegionUp OnRegionUp; |
66 | event ChildAgentUpdate OnChildAgentUpdate; | 68 | event ChildAgentUpdate OnChildAgentUpdate; |
69 | |||
67 | } | 70 | } |
68 | } \ No newline at end of file | 71 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs index 1db5aae..c12c3df 100644 --- a/OpenSim/Framework/RegionCommsListener.cs +++ b/OpenSim/Framework/RegionCommsListener.cs | |||
@@ -45,6 +45,7 @@ namespace OpenSim.Framework | |||
45 | public event CloseAgentConnection OnCloseAgentConnection; | 45 | public event CloseAgentConnection OnCloseAgentConnection; |
46 | public event RegionUp OnRegionUp; | 46 | public event RegionUp OnRegionUp; |
47 | public event ChildAgentUpdate OnChildAgentUpdate; | 47 | public event ChildAgentUpdate OnChildAgentUpdate; |
48 | |||
48 | 49 | ||
49 | 50 | ||
50 | public string debugRegionName = String.Empty; | 51 | public string debugRegionName = String.Empty; |
@@ -139,12 +140,15 @@ namespace OpenSim.Framework | |||
139 | return false; | 140 | return false; |
140 | } | 141 | } |
141 | 142 | ||
142 | public virtual void TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID) | 143 | public virtual bool TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID) |
143 | { | 144 | { |
144 | if (OnCloseAgentConnection != null) | 145 | if (OnCloseAgentConnection != null) |
145 | { | 146 | { |
146 | OnCloseAgentConnection(regionHandle, agentID); | 147 | OnCloseAgentConnection(regionHandle, agentID); |
148 | return true; | ||
149 | |||
147 | } | 150 | } |
151 | return false; | ||
148 | } | 152 | } |
149 | 153 | ||
150 | /// <summary> | 154 | /// <summary> |
@@ -179,5 +183,13 @@ namespace OpenSim.Framework | |||
179 | 183 | ||
180 | return false; | 184 | return false; |
181 | } | 185 | } |
186 | |||
187 | public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) | ||
188 | { | ||
189 | if (OnCloseAgentConnection != null) | ||
190 | return OnCloseAgentConnection(regionHandle, agentID); | ||
191 | |||
192 | return false; | ||
193 | } | ||
182 | } | 194 | } |
183 | } \ No newline at end of file | 195 | } \ No newline at end of file |