aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-01 23:49:02 +0100
committerJustin Clark-Casey (justincc)2012-05-01 23:49:02 +0100
commit40f3c24562e620e8f09b3569c0b643eb5eae013f (patch)
tree6ac4a31f063f4980b3154f592d8a049f93b853c2
parentRemove some test code that accidentally crept in with 9d2e1c67 (diff)
downloadopensim-SC_OLD-40f3c24562e620e8f09b3569c0b643eb5eae013f.zip
opensim-SC_OLD-40f3c24562e620e8f09b3569c0b643eb5eae013f.tar.gz
opensim-SC_OLD-40f3c24562e620e8f09b3569c0b643eb5eae013f.tar.bz2
opensim-SC_OLD-40f3c24562e620e8f09b3569c0b643eb5eae013f.tar.xz
Comment out the five second sleep in etm.DoTeleport() if the old agent needs to be closed because it is no longer in the child's view distance.
This sleep appears unnecessary since a sleep has already occurred in WaitForCallback() whilst waiting for the destination region to notify of teleport success. There are no async operations between this sleep and the WaitForCallback() If this sleep is present, then teleporting back to the source region within 5 seconds results in a disconnection. If this sleep is commented out then teleporting quickly back and forth between two simulators appears to work without issue. Tested on standalone, local grid and distributed grid. Please revert if there's something that I've missed.
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 75d1586..8d5e0a5 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -595,7 +595,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
595 595
596 if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) 596 if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
597 { 597 {
598 Thread.Sleep(5000); 598// Thread.Sleep(5000);
599 sp.Close(); 599 sp.Close();
600 sp.Scene.IncomingCloseAgent(sp.UUID); 600 sp.Scene.IncomingCloseAgent(sp.UUID);
601 } 601 }