aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2013-07-24 17:10:26 -0700
committerDiva Canto2013-07-24 17:10:26 -0700
commit20b989e048fff3215b90af6a34954b7ceb5e9868 (patch)
tree898545ac3ae11b5aaece1237d65365709c15c201 /OpenSim
parentDeleted all [ZZZ] debug messages. (diff)
downloadopensim-SC_OLD-20b989e048fff3215b90af6a34954b7ceb5e9868.zip
opensim-SC_OLD-20b989e048fff3215b90af6a34954b7ceb5e9868.tar.gz
opensim-SC_OLD-20b989e048fff3215b90af6a34954b7ceb5e9868.tar.bz2
opensim-SC_OLD-20b989e048fff3215b90af6a34954b7ceb5e9868.tar.xz
Increased the wait time to 15 secs. In a 0.7.5 standalone where the effect was always present, this seems to have fixed it.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 70fbfc3..ea2d9b5 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -922,7 +922,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
922 // BEFORE THEY SETTLE IN THE NEW REGION. 922 // BEFORE THEY SETTLE IN THE NEW REGION.
923 // DECREASING THE WAIT TIME HERE WILL EITHER RESULT IN A VIEWER CRASH OR 923 // DECREASING THE WAIT TIME HERE WILL EITHER RESULT IN A VIEWER CRASH OR
924 // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS. 924 // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS.
925 Thread.Sleep(5000); 925 Thread.Sleep(15000);
926 926
927 sp.Scene.IncomingCloseAgent(sp.UUID, false); 927 sp.Scene.IncomingCloseAgent(sp.UUID, false);
928 } 928 }
@@ -1053,7 +1053,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1053 // BEFORE THEY SETTLE IN THE NEW REGION. 1053 // BEFORE THEY SETTLE IN THE NEW REGION.
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(5000); 1056 Thread.Sleep(15000);
1057 sp.Scene.IncomingCloseAgent(sp.UUID, false); 1057 sp.Scene.IncomingCloseAgent(sp.UUID, false);
1058 } 1058 }
1059 else 1059 else