diff options
author | Justin Clarke Casey | 2008-11-12 19:12:33 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-12 19:12:33 +0000 |
commit | b636bb0f9ec50252164da6e94f2f7b71af8afe6b (patch) | |
tree | 64487d9680429e3ffc708e03dd33f8d5522cf802 /OpenSim/Framework/RegionCommsListener.cs | |
parent | Change HTTP server backlog/acceptors to 64, per Adam Z (diff) | |
download | opensim-SC_OLD-b636bb0f9ec50252164da6e94f2f7b71af8afe6b.zip opensim-SC_OLD-b636bb0f9ec50252164da6e94f2f7b71af8afe6b.tar.gz opensim-SC_OLD-b636bb0f9ec50252164da6e94f2f7b71af8afe6b.tar.bz2 opensim-SC_OLD-b636bb0f9ec50252164da6e94f2f7b71af8afe6b.tar.xz |
* Stop the pointless passing of a scene's own region handler back to it in region comms
* Some scene methods ignored it, others did nothing if the region handler given did not match their own (which would never be triggered)
Diffstat (limited to 'OpenSim/Framework/RegionCommsListener.cs')
-rw-r--r-- | OpenSim/Framework/RegionCommsListener.cs | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs index 5d3c2fe..b45d7b9 100644 --- a/OpenSim/Framework/RegionCommsListener.cs +++ b/OpenSim/Framework/RegionCommsListener.cs | |||
@@ -31,6 +31,9 @@ using OpenMetaverse; | |||
31 | 31 | ||
32 | namespace OpenSim.Framework | 32 | namespace OpenSim.Framework |
33 | { | 33 | { |
34 | /// <summary> | ||
35 | /// Sandbox mode region comms listener. There is one of these per region | ||
36 | /// </summary> | ||
34 | public class RegionCommsListener : IRegionCommsListener | 37 | public class RegionCommsListener : IRegionCommsListener |
35 | { | 38 | { |
36 | public string debugRegionName = String.Empty; | 39 | public string debugRegionName = String.Empty; |
@@ -71,12 +74,12 @@ namespace OpenSim.Framework | |||
71 | /// </summary> | 74 | /// </summary> |
72 | /// <param name="agent"></param> | 75 | /// <param name="agent"></param> |
73 | /// <returns></returns> | 76 | /// <returns></returns> |
74 | public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) | 77 | public virtual bool TriggerExpectUser(AgentCircuitData agent) |
75 | { | 78 | { |
76 | handlerExpectUser = OnExpectUser; | 79 | handlerExpectUser = OnExpectUser; |
77 | if (handlerExpectUser != null) | 80 | if (handlerExpectUser != null) |
78 | { | 81 | { |
79 | handlerExpectUser(regionHandle, agent); | 82 | handlerExpectUser(agent); |
80 | return true; | 83 | return true; |
81 | } | 84 | } |
82 | 85 | ||
@@ -84,23 +87,22 @@ namespace OpenSim.Framework | |||
84 | } | 87 | } |
85 | 88 | ||
86 | // From User Server | 89 | // From User Server |
87 | public virtual void TriggerLogOffUser(ulong regionHandle, UUID agentID, UUID RegionSecret, string message) | 90 | public virtual void TriggerLogOffUser(UUID agentID, UUID RegionSecret, string message) |
88 | { | 91 | { |
89 | handlerLogOffUser = OnLogOffUser; | 92 | handlerLogOffUser = OnLogOffUser; |
90 | if (handlerLogOffUser != null) | 93 | if (handlerLogOffUser != null) |
91 | { | 94 | { |
92 | handlerLogOffUser(regionHandle, agentID, RegionSecret, message); | 95 | handlerLogOffUser(agentID, RegionSecret, message); |
93 | } | 96 | } |
94 | 97 | ||
95 | } | 98 | } |
96 | 99 | ||
97 | 100 | public virtual bool TriggerExpectPrim(UUID primID, string objData, int XMLMethod) | |
98 | public virtual bool TriggerExpectPrim(ulong regionHandle, UUID primID, string objData, int XMLMethod) | ||
99 | { | 101 | { |
100 | handlerExpectPrim = OnExpectPrim; | 102 | handlerExpectPrim = OnExpectPrim; |
101 | if (handlerExpectPrim != null) | 103 | if (handlerExpectPrim != null) |
102 | { | 104 | { |
103 | handlerExpectPrim(regionHandle, primID, objData, XMLMethod); | 105 | handlerExpectPrim(primID, objData, XMLMethod); |
104 | return true; | 106 | return true; |
105 | } | 107 | } |
106 | return false; | 108 | return false; |
@@ -117,69 +119,68 @@ namespace OpenSim.Framework | |||
117 | return false; | 119 | return false; |
118 | } | 120 | } |
119 | 121 | ||
120 | public virtual bool TriggerChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData) | 122 | public virtual bool TriggerChildAgentUpdate(ChildAgentDataUpdate cAgentData) |
121 | { | 123 | { |
122 | handlerChildAgentUpdate = OnChildAgentUpdate; | 124 | handlerChildAgentUpdate = OnChildAgentUpdate; |
123 | if (handlerChildAgentUpdate != null) | 125 | if (handlerChildAgentUpdate != null) |
124 | { | 126 | { |
125 | handlerChildAgentUpdate(regionHandle, cAgentData); | 127 | handlerChildAgentUpdate(cAgentData); |
126 | return true; | 128 | return true; |
127 | } | 129 | } |
128 | return false; | 130 | return false; |
129 | } | 131 | } |
130 | 132 | ||
131 | public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, | 133 | public virtual bool TriggerExpectAvatarCrossing(UUID agentID, Vector3 position, bool isFlying) |
132 | bool isFlying) | ||
133 | { | 134 | { |
134 | handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion; | 135 | handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion; |
135 | if (handlerAvatarCrossingIntoRegion != null) | 136 | if (handlerAvatarCrossingIntoRegion != null) |
136 | { | 137 | { |
137 | handlerAvatarCrossingIntoRegion(regionHandle, agentID, position, isFlying); | 138 | handlerAvatarCrossingIntoRegion(agentID, position, isFlying); |
138 | return true; | 139 | return true; |
139 | } | 140 | } |
140 | return false; | 141 | return false; |
141 | } | 142 | } |
142 | 143 | ||
143 | public virtual bool TriggerExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, | 144 | public virtual bool TriggerExpectPrimCrossing(UUID primID, Vector3 position, |
144 | bool isPhysical) | 145 | bool isPhysical) |
145 | { | 146 | { |
146 | handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion; | 147 | handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion; |
147 | if (handlerPrimCrossingIntoRegion != null) | 148 | if (handlerPrimCrossingIntoRegion != null) |
148 | { | 149 | { |
149 | handlerPrimCrossingIntoRegion(regionHandle, primID, position, isPhysical); | 150 | handlerPrimCrossingIntoRegion(primID, position, isPhysical); |
150 | return true; | 151 | return true; |
151 | } | 152 | } |
152 | return false; | 153 | return false; |
153 | } | 154 | } |
154 | 155 | ||
155 | public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, UUID agentID) | 156 | public virtual bool TriggerAcknowledgeAgentCrossed(UUID agentID) |
156 | { | 157 | { |
157 | handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed; | 158 | handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed; |
158 | if (handlerAcknowledgeAgentCrossed != null) | 159 | if (handlerAcknowledgeAgentCrossed != null) |
159 | { | 160 | { |
160 | handlerAcknowledgeAgentCrossed(regionHandle, agentID); | 161 | handlerAcknowledgeAgentCrossed(agentID); |
161 | return true; | 162 | return true; |
162 | } | 163 | } |
163 | return false; | 164 | return false; |
164 | } | 165 | } |
165 | 166 | ||
166 | public virtual bool TriggerAcknowledgePrimCrossed(ulong regionHandle, UUID primID) | 167 | public virtual bool TriggerAcknowledgePrimCrossed(UUID primID) |
167 | { | 168 | { |
168 | handlerAcknowledgePrimCrossed = OnAcknowledgePrimCrossed; | 169 | handlerAcknowledgePrimCrossed = OnAcknowledgePrimCrossed; |
169 | if (handlerAcknowledgePrimCrossed != null) | 170 | if (handlerAcknowledgePrimCrossed != null) |
170 | { | 171 | { |
171 | handlerAcknowledgePrimCrossed(regionHandle, primID); | 172 | handlerAcknowledgePrimCrossed(primID); |
172 | return true; | 173 | return true; |
173 | } | 174 | } |
174 | return false; | 175 | return false; |
175 | } | 176 | } |
176 | 177 | ||
177 | public virtual bool TriggerCloseAgentConnection(ulong regionHandle, UUID agentID) | 178 | public virtual bool TriggerCloseAgentConnection(UUID agentID) |
178 | { | 179 | { |
179 | handlerCloseAgentConnection = OnCloseAgentConnection; | 180 | handlerCloseAgentConnection = OnCloseAgentConnection; |
180 | if (handlerCloseAgentConnection != null) | 181 | if (handlerCloseAgentConnection != null) |
181 | { | 182 | { |
182 | handlerCloseAgentConnection(regionHandle, agentID); | 183 | handlerCloseAgentConnection(agentID); |
183 | return true; | 184 | return true; |
184 | } | 185 | } |
185 | return false; | 186 | return false; |
@@ -220,11 +221,11 @@ namespace OpenSim.Framework | |||
220 | return false; | 221 | return false; |
221 | } | 222 | } |
222 | 223 | ||
223 | public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, UUID agentID) | 224 | public bool TriggerTellRegionToCloseChildConnection(UUID agentID) |
224 | { | 225 | { |
225 | handlerCloseAgentConnection = OnCloseAgentConnection; | 226 | handlerCloseAgentConnection = OnCloseAgentConnection; |
226 | if (handlerCloseAgentConnection != null) | 227 | if (handlerCloseAgentConnection != null) |
227 | return handlerCloseAgentConnection(regionHandle, agentID); | 228 | return handlerCloseAgentConnection(agentID); |
228 | 229 | ||
229 | return false; | 230 | return false; |
230 | } | 231 | } |