aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-07 07:35:51 +0000
committerMelanie Thielker2008-11-07 07:35:51 +0000
commit506a3aa21566a43471f26220e6b595a4f802dfa2 (patch)
treec39b9391ae33675ab945dab58fc0be0236bd4821
parentFixing up some remaining attachment issues (diff)
downloadopensim-SC_OLD-506a3aa21566a43471f26220e6b595a4f802dfa2.zip
opensim-SC_OLD-506a3aa21566a43471f26220e6b595a4f802dfa2.tar.gz
opensim-SC_OLD-506a3aa21566a43471f26220e6b595a4f802dfa2.tar.bz2
opensim-SC_OLD-506a3aa21566a43471f26220e6b595a4f802dfa2.tar.xz
Change teleport timings
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index be21460..540303a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -684,7 +684,7 @@ namespace OpenSim.Region.Environment.Scenes
684 684
685 m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, 685 m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId,
686 position, false); 686 position, false);
687 Thread.Sleep(4000); 687 Thread.Sleep(2000);
688 AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo(); 688 AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo();
689 689
690 // TODO Should construct this behind a method 690 // TODO Should construct this behind a method
@@ -709,7 +709,7 @@ namespace OpenSim.Region.Environment.Scenes
709 } 709 }
710 710
711 avatar.MakeChildAgent(); 711 avatar.MakeChildAgent();
712 Thread.Sleep(5000); 712 Thread.Sleep(7000);
713 avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true); 713 avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true);
714 if (KiPrimitive != null) 714 if (KiPrimitive != null)
715 { 715 {