aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-07-26 01:04:16 +0100
committerJustin Clark-Casey (justincc)2013-07-26 01:04:16 +0100
commit1fabdcc43cc2d62ff03888166582b25884056e94 (patch)
tree9bcf463ff48ccd98c87dc76c5efc0f3b988c9d39 /OpenSim/Region/CoreModules/Framework
parentIncreased the wait time to 15 secs. In a 0.7.5 standalone where the effect wa... (diff)
downloadopensim-SC_OLD-1fabdcc43cc2d62ff03888166582b25884056e94.zip
opensim-SC_OLD-1fabdcc43cc2d62ff03888166582b25884056e94.tar.gz
opensim-SC_OLD-1fabdcc43cc2d62ff03888166582b25884056e94.tar.bz2
opensim-SC_OLD-1fabdcc43cc2d62ff03888166582b25884056e94.tar.xz
If a returning teleport starts to reuse a downgraded child connection that was a previous root agent, do not close that child agent at the end of the 15 sec teleport timer.
This prevents an issue if the user teleports back to the neighbour simulator of a source before 15 seconds have elapsed. This more closely emulates observed linden behaviour, though the timeout there is 50 secs and applies to all the pre-teleport agents. Currently sticks a DoNotClose flag on ScenePresence though this may be temporary as possibly it could be incorporated into the ETM state machine
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index ea2d9b5..31db778 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1054,7 +1054,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1054 // DECREASING THE WAIT TIME HERE WILL EITHER RESULT IN A VIEWER CRASH OR 1054 // DECREASING THE WAIT TIME HERE WILL EITHER RESULT IN A VIEWER CRASH OR
1055 // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS. 1055 // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS.
1056 Thread.Sleep(15000); 1056 Thread.Sleep(15000);
1057 sp.Scene.IncomingCloseAgent(sp.UUID, false); 1057
1058 if (!sp.DoNotClose)
1059 {
1060 sp.Scene.IncomingCloseAgent(sp.UUID, false);
1061 }
1062 else
1063 {
1064 sp.DoNotClose = false;
1065 }
1058 } 1066 }
1059 else 1067 else
1060 // now we have a child agent in this region. 1068 // now we have a child agent in this region.