diff options
author | Jeff Ames | 2008-05-16 01:22:11 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-16 01:22:11 +0000 |
commit | 65c5efe43b68700bad94076d4cd421160203c5de (patch) | |
tree | 589b56649ed02f4942671fd6e51c6dc43f682e0d /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |
parent | Thank you very much, mjm for : (diff) | |
download | opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.zip opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.tar.gz opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.tar.bz2 opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 18ce61a..885d1e9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
104 | regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing; | 104 | regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing; |
105 | regionCommsHost.OnCloseAgentConnection += CloseConnection; | 105 | regionCommsHost.OnCloseAgentConnection += CloseConnection; |
106 | regionCommsHost.OnRegionUp += newRegionUp; | 106 | regionCommsHost.OnRegionUp += newRegionUp; |
107 | regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate; | 107 | regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate; |
108 | } | 108 | } |
109 | else | 109 | else |
110 | { | 110 | { |
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
130 | #region CommsManager Event handlers | 130 | #region CommsManager Event handlers |
131 | 131 | ||
132 | /// <summary> | 132 | /// <summary> |
133 | /// | 133 | /// |
134 | /// </summary> | 134 | /// </summary> |
135 | /// <param name="regionHandle"></param> | 135 | /// <param name="regionHandle"></param> |
136 | /// <param name="agent"></param> | 136 | /// <param name="agent"></param> |
@@ -289,7 +289,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
289 | agent.child = true; | 289 | agent.child = true; |
290 | 290 | ||
291 | InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; | 291 | InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; |
292 | 292 | ||
293 | try | 293 | try |
294 | { | 294 | { |
295 | d.BeginInvoke(avatar, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint, | 295 | d.BeginInvoke(avatar, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint, |
@@ -299,20 +299,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
299 | catch (Exception e) | 299 | catch (Exception e) |
300 | { | 300 | { |
301 | m_log.ErrorFormat( | 301 | m_log.ErrorFormat( |
302 | "[REGIONINFO]: Could not resolve external hostname {0} for region {1} ({2}, {3}). {4}", | 302 | "[REGIONINFO]: Could not resolve external hostname {0} for region {1} ({2}, {3}). {4}", |
303 | neighbours[i].ExternalHostName, | 303 | neighbours[i].ExternalHostName, |
304 | neighbours[i].RegionHandle, | 304 | neighbours[i].RegionHandle, |
305 | neighbours[i].RegionLocX, | 305 | neighbours[i].RegionLocX, |
306 | neighbours[i].RegionLocY, | 306 | neighbours[i].RegionLocY, |
307 | e); | 307 | e); |
308 | 308 | ||
309 | // FIXME: Okay, even though we've failed, we're still going to throw the exception on, | 309 | // FIXME: Okay, even though we've failed, we're still going to throw the exception on, |
310 | // since I don't know what will happen if we just let the client continue | 310 | // since I don't know what will happen if we just let the client continue |
311 | 311 | ||
312 | // XXX: Well, decided to swallow the exception instead for now. Let us see how that goes. | 312 | // XXX: Well, decided to swallow the exception instead for now. Let us see how that goes. |
313 | // throw e; | 313 | // throw e; |
314 | 314 | ||
315 | } | 315 | } |
316 | } | 316 | } |
317 | } | 317 | } |
318 | } | 318 | } |
@@ -362,12 +362,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
362 | { | 362 | { |
363 | m_log.Info("[INTERGRID]: Completed informing neighbors that I'm here"); | 363 | m_log.Info("[INTERGRID]: Completed informing neighbors that I'm here"); |
364 | handlerRegionUp = OnRegionUp; | 364 | handlerRegionUp = OnRegionUp; |
365 | 365 | ||
366 | // yes, we're notifying ourselves. | 366 | // yes, we're notifying ourselves. |
367 | if (handlerRegionUp != null) | 367 | if (handlerRegionUp != null) |
368 | handlerRegionUp(region); | 368 | handlerRegionUp(region); |
369 | 369 | ||
370 | 370 | ||
371 | } | 371 | } |
372 | else | 372 | else |
373 | { | 373 | { |
@@ -407,9 +407,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
407 | /// <summary> | 407 | /// <summary> |
408 | /// This informs all neighboring regions about the settings of it's child agent. | 408 | /// This informs all neighboring regions about the settings of it's child agent. |
409 | /// Calls an asynchronous method to do so.. so it doesn't lag the sim. | 409 | /// Calls an asynchronous method to do so.. so it doesn't lag the sim. |
410 | /// | 410 | /// |
411 | /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc. | 411 | /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc. |
412 | /// | 412 | /// |
413 | /// </summary> | 413 | /// </summary> |
414 | private void SendChildAgentDataUpdateAsync(ChildAgentDataUpdate cAgentData, ScenePresence presence) | 414 | private void SendChildAgentDataUpdateAsync(ChildAgentDataUpdate cAgentData, ScenePresence presence) |
415 | { | 415 | { |
@@ -468,14 +468,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
468 | if (regionAccepted) | 468 | if (regionAccepted) |
469 | { | 469 | { |
470 | m_log.Info("[INTERGRID]: Completed sending agent Close agent Request to neighbor"); | 470 | m_log.Info("[INTERGRID]: Completed sending agent Close agent Request to neighbor"); |
471 | 471 | ||
472 | } | 472 | } |
473 | else | 473 | else |
474 | { | 474 | { |
475 | m_log.Info("[INTERGRID]: Failed sending agent Close agent Request to neighbor"); | 475 | m_log.Info("[INTERGRID]: Failed sending agent Close agent Request to neighbor"); |
476 | 476 | ||
477 | } | 477 | } |
478 | 478 | ||
479 | } | 479 | } |
480 | // We remove the list of known regions from the agent's known region list through an event | 480 | // We remove the list of known regions from the agent's known region list through an event |
481 | // to scene, because, if an agent logged of, it's likely that there will be no scene presence | 481 | // to scene, because, if an agent logged of, it's likely that there will be no scene presence |
@@ -572,25 +572,25 @@ namespace OpenSim.Region.Environment.Scenes | |||
572 | if (destRegionUp) | 572 | if (destRegionUp) |
573 | { | 573 | { |
574 | avatar.Close(); | 574 | avatar.Close(); |
575 | 575 | ||
576 | // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport | 576 | // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport |
577 | // failure at this point (unlike a border crossing failure). So perhaps this can never fail | 577 | // failure at this point (unlike a border crossing failure). So perhaps this can never fail |
578 | // once we reach here... | 578 | // once we reach here... |
579 | avatar.Scene.RemoveCapsHandler(avatar.UUID); | 579 | avatar.Scene.RemoveCapsHandler(avatar.UUID); |
580 | 580 | ||
581 | m_commsProvider.InterRegion.InformRegionOfChildAgent(regionHandle, agent); | 581 | m_commsProvider.InterRegion.InformRegionOfChildAgent(regionHandle, agent); |
582 | m_commsProvider.InterRegion.ExpectAvatarCrossing(regionHandle, avatar.ControllingClient.AgentId, | 582 | m_commsProvider.InterRegion.ExpectAvatarCrossing(regionHandle, avatar.ControllingClient.AgentId, |
583 | position, false); | 583 | position, false); |
584 | AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo(); | 584 | AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo(); |
585 | 585 | ||
586 | // TODO Should construct this behind a method | 586 | // TODO Should construct this behind a method |
587 | string capsPath = | 587 | string capsPath = |
588 | "http://" + reg.ExternalHostName + ":" + reg.HttpPort | 588 | "http://" + reg.ExternalHostName + ":" + reg.HttpPort |
589 | + "/CAPS/" + circuitdata.CapsPath + "0000/"; | 589 | + "/CAPS/" + circuitdata.CapsPath + "0000/"; |
590 | 590 | ||
591 | m_log.DebugFormat( | 591 | m_log.DebugFormat( |
592 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); | 592 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); |
593 | 593 | ||
594 | avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), | 594 | avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), |
595 | capsPath); | 595 | capsPath); |
596 | avatar.MakeChildAgent(); | 596 | avatar.MakeChildAgent(); |
@@ -618,7 +618,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
618 | } | 618 | } |
619 | 619 | ||
620 | /// <summary> | 620 | /// <summary> |
621 | /// | 621 | /// |
622 | /// </summary> | 622 | /// </summary> |
623 | /// <param name="regionhandle"></param> | 623 | /// <param name="regionhandle"></param> |
624 | /// <param name="agentID"></param> | 624 | /// <param name="agentID"></param> |