diff options
author | Justin Clarke Casey | 2009-01-16 21:56:13 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-16 21:56:13 +0000 |
commit | eca6442bae4093019bd221e87413c74c77c4ff5d (patch) | |
tree | e62245b1cf2a5f0afdde443fba38c2b62d401100 /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |
parent | * minor: Future archiver test stub (diff) | |
download | opensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.zip opensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.tar.gz opensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.tar.bz2 opensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.tar.xz |
* Rig up enough infrastructure to actually perform a successful 'standalone' teleport unit test with checks that the scene presence disappeared from sceneA and appeared in
sceneB
* However, I'm not convinced that the actual process in the test completely reflects reality, and a lot of stuff had to be rigged up (which should get resolved over time)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 65e62ef..a46fa0b 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -758,6 +758,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
758 | // both regions | 758 | // both regions |
759 | if (avatar.ParentID != (uint)0) | 759 | if (avatar.ParentID != (uint)0) |
760 | avatar.StandUp(); | 760 | avatar.StandUp(); |
761 | |||
761 | if (!avatar.ValidateAttachments()) | 762 | if (!avatar.ValidateAttachments()) |
762 | { | 763 | { |
763 | avatar.ControllingClient.SendTeleportFailed("Inconsistent attachment state"); | 764 | avatar.ControllingClient.SendTeleportFailed("Inconsistent attachment state"); |
@@ -772,13 +773,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
772 | // once we reach here... | 773 | // once we reach here... |
773 | //avatar.Scene.RemoveCapsHandler(avatar.UUID); | 774 | //avatar.Scene.RemoveCapsHandler(avatar.UUID); |
774 | 775 | ||
775 | |||
776 | string capsPath = String.Empty; | 776 | string capsPath = String.Empty; |
777 | AgentCircuitData agentCircuit = avatar.ControllingClient.RequestClientInfo(); | 777 | AgentCircuitData agentCircuit = avatar.ControllingClient.RequestClientInfo(); |
778 | agentCircuit.BaseFolder = UUID.Zero; | 778 | agentCircuit.BaseFolder = UUID.Zero; |
779 | agentCircuit.InventoryFolder = UUID.Zero; | 779 | agentCircuit.InventoryFolder = UUID.Zero; |
780 | agentCircuit.startpos = position; | 780 | agentCircuit.startpos = position; |
781 | agentCircuit.child = true; | 781 | agentCircuit.child = true; |
782 | |||
782 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) | 783 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) |
783 | { | 784 | { |
784 | // brand new agent, let's create a new caps seed | 785 | // brand new agent, let's create a new caps seed |
@@ -871,7 +872,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
871 | teleportFlags, capsPath); | 872 | teleportFlags, capsPath); |
872 | } | 873 | } |
873 | 874 | ||
874 | |||
875 | // TeleportFinish makes the client send CompleteMovementIntoRegion (at the destination), which | 875 | // TeleportFinish makes the client send CompleteMovementIntoRegion (at the destination), which |
876 | // trigers a whole shebang of things there, including MakeRoot. So let's wait for confirmation | 876 | // trigers a whole shebang of things there, including MakeRoot. So let's wait for confirmation |
877 | // that the client contacted the destination before we send the attachments and close things here. | 877 | // that the client contacted the destination before we send the attachments and close things here. |