aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-12 19:12:33 +0000
committerJustin Clarke Casey2008-11-12 19:12:33 +0000
commitb636bb0f9ec50252164da6e94f2f7b71af8afe6b (patch)
tree64487d9680429e3ffc708e03dd33f8d5522cf802 /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
parentChange HTTP server backlog/acceptors to 64, per Adam Z (diff)
downloadopensim-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/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs39
1 files changed, 19 insertions, 20 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 540303a..830a63d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -155,22 +155,22 @@ namespace OpenSim.Region.Environment.Scenes
155 /// <param name="regionHandle"></param> 155 /// <param name="regionHandle"></param>
156 /// <param name="agent"></param> 156 /// <param name="agent"></param>
157 /// 157 ///
158 protected void NewUserConnection(ulong regionHandle, AgentCircuitData agent) 158 protected void NewUserConnection(AgentCircuitData agent)
159 { 159 {
160 handlerExpectUser = OnExpectUser; 160 handlerExpectUser = OnExpectUser;
161 if (handlerExpectUser != null) 161 if (handlerExpectUser != null)
162 { 162 {
163 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: OnExpectUser Fired for User:" + agent.firstname + " " + agent.lastname); 163 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: OnExpectUser Fired for User:" + agent.firstname + " " + agent.lastname);
164 handlerExpectUser(regionHandle, agent); 164 handlerExpectUser(agent);
165 } 165 }
166 } 166 }
167 167
168 protected void GridLogOffUser(ulong regionHandle, UUID AgentID, UUID RegionSecret, string message) 168 protected void GridLogOffUser(UUID AgentID, UUID RegionSecret, string message)
169 { 169 {
170 handlerLogOffUser = OnLogOffUser; 170 handlerLogOffUser = OnLogOffUser;
171 if (handlerLogOffUser != null) 171 if (handlerLogOffUser != null)
172 { 172 {
173 handlerLogOffUser(regionHandle, AgentID, RegionSecret, message); 173 handlerLogOffUser(AgentID, RegionSecret, message);
174 } 174 }
175 } 175 }
176 176
@@ -185,31 +185,31 @@ namespace OpenSim.Region.Environment.Scenes
185 return true; 185 return true;
186 } 186 }
187 187
188 protected bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData) 188 protected bool ChildAgentUpdate(ChildAgentDataUpdate cAgentData)
189 { 189 {
190 handlerChildAgentUpdate = OnChildAgentUpdate; 190 handlerChildAgentUpdate = OnChildAgentUpdate;
191 if (handlerChildAgentUpdate != null) 191 if (handlerChildAgentUpdate != null)
192 handlerChildAgentUpdate(regionHandle, cAgentData); 192 handlerChildAgentUpdate(cAgentData);
193 193
194 194
195 return true; 195 return true;
196 } 196 }
197 197
198 protected void AgentCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying) 198 protected void AgentCrossing(UUID agentID, Vector3 position, bool isFlying)
199 { 199 {
200 handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion; 200 handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion;
201 if (handlerAvatarCrossingIntoRegion != null) 201 if (handlerAvatarCrossingIntoRegion != null)
202 { 202 {
203 handlerAvatarCrossingIntoRegion(regionHandle, agentID, position, isFlying); 203 handlerAvatarCrossingIntoRegion(agentID, position, isFlying);
204 } 204 }
205 } 205 }
206 206
207 protected bool IncomingPrimCrossing(ulong regionHandle, UUID primID, String objXMLData, int XMLMethod) 207 protected bool IncomingPrimCrossing(UUID primID, String objXMLData, int XMLMethod)
208 { 208 {
209 handlerExpectPrim = OnExpectPrim; 209 handlerExpectPrim = OnExpectPrim;
210 if (handlerExpectPrim != null) 210 if (handlerExpectPrim != null)
211 { 211 {
212 return handlerExpectPrim(regionHandle, primID, objXMLData, XMLMethod); 212 return handlerExpectPrim(primID, objXMLData, XMLMethod);
213 } 213 }
214 else 214 else
215 { 215 {
@@ -218,23 +218,25 @@ namespace OpenSim.Region.Environment.Scenes
218 218
219 } 219 }
220 220
221 protected void PrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical) 221 protected void PrimCrossing(UUID primID, Vector3 position, bool isPhysical)
222 { 222 {
223 handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion; 223 handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion;
224 if (handlerPrimCrossingIntoRegion != null) 224 if (handlerPrimCrossingIntoRegion != null)
225 { 225 {
226 handlerPrimCrossingIntoRegion(regionHandle, primID, position, isPhysical); 226 handlerPrimCrossingIntoRegion(primID, position, isPhysical);
227 } 227 }
228 } 228 }
229 229
230 protected bool CloseConnection(ulong regionHandle, UUID agentID) 230 protected bool CloseConnection(UUID agentID)
231 { 231 {
232 m_log.Info("[INTERREGION]: Incoming Agent Close Request for agent: " + agentID.ToString()); 232 m_log.Debug("[INTERREGION]: Incoming Agent Close Request for agent: " + agentID);
233
233 handlerCloseAgentConnection = OnCloseAgentConnection; 234 handlerCloseAgentConnection = OnCloseAgentConnection;
234 if (handlerCloseAgentConnection != null) 235 if (handlerCloseAgentConnection != null)
235 { 236 {
236 return handlerCloseAgentConnection(regionHandle, agentID); 237 return handlerCloseAgentConnection(agentID);
237 } 238 }
239
238 return false; 240 return false;
239 } 241 }
240 242
@@ -416,8 +418,6 @@ namespace OpenSim.Region.Environment.Scenes
416 // yes, we're notifying ourselves. 418 // yes, we're notifying ourselves.
417 if (handlerRegionUp != null) 419 if (handlerRegionUp != null)
418 handlerRegionUp(region); 420 handlerRegionUp(region);
419
420
421 } 421 }
422 else 422 else
423 { 423 {
@@ -726,7 +726,7 @@ namespace OpenSim.Region.Environment.Scenes
726 { 726 {
727 SendCloseChildAgentConnections(avatar.UUID,avatar.GetKnownRegionList()); 727 SendCloseChildAgentConnections(avatar.UUID,avatar.GetKnownRegionList());
728 SendCloseChildAgentConnections(avatar.UUID, childRegions); 728 SendCloseChildAgentConnections(avatar.UUID, childRegions);
729 CloseConnection(m_regionInfo.RegionHandle, avatar.UUID); 729 CloseConnection(avatar.UUID);
730 } 730 }
731 // if (teleport success) // seems to be always success here 731 // if (teleport success) // seems to be always success here
732 // the user may change their profile information in other region, 732 // the user may change their profile information in other region,
@@ -763,7 +763,7 @@ namespace OpenSim.Region.Environment.Scenes
763 } 763 }
764 764
765 /// <summary> 765 /// <summary>
766 /// 766 /// Inform a neighbouring region that an avatar is about to cross into it.
767 /// </summary> 767 /// </summary>
768 /// <param name="regionhandle"></param> 768 /// <param name="regionhandle"></param>
769 /// <param name="agentID"></param> 769 /// <param name="agentID"></param>
@@ -778,7 +778,6 @@ namespace OpenSim.Region.Environment.Scenes
778 return m_commsProvider.InterRegion.InformRegionOfPrimCrossing(regionhandle, primID, objData, XMLMethod); 778 return m_commsProvider.InterRegion.InformRegionOfPrimCrossing(regionhandle, primID, objData, XMLMethod);
779 } 779 }
780 780
781
782 public Dictionary<string, string> GetGridSettings() 781 public Dictionary<string, string> GetGridSettings()
783 { 782 {
784 return m_commsProvider.GridService.GetGridSettings(); 783 return m_commsProvider.GridService.GetGridSettings();