aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDiva Canto2013-07-21 20:22:13 -0700
committerDiva Canto2013-07-24 14:27:37 -0700
commitaae29c0ee2467a7978df53dba6f8461d1f566c59 (patch)
tree9e53c07e1f619956da2c2470a90b43b559a47168 /OpenSim/Region/Framework
parentEXPERIMENTAL: yet another variation of ES/EAC/TPFinish (diff)
downloadopensim-SC_OLD-aae29c0ee2467a7978df53dba6f8461d1f566c59.zip
opensim-SC_OLD-aae29c0ee2467a7978df53dba6f8461d1f566c59.tar.gz
opensim-SC_OLD-aae29c0ee2467a7978df53dba6f8461d1f566c59.tar.bz2
opensim-SC_OLD-aae29c0ee2467a7978df53dba6f8461d1f566c59.tar.xz
Further tweaks on TPs: not sending the callback URL and instead waiting 15sec before closing the agent. This seems to be working fairly well. The viewer seems to have an 8 sec delay between UseCircuitCode and CompleteMovement.
Also added back the position on UpdateAgent, because it's needed for TPing between neighboring regions.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f766140..d4ef3d9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4269,7 +4269,7 @@ namespace OpenSim.Region.Framework.Scenes
4269 /// <param name='agentID'></param> 4269 /// <param name='agentID'></param>
4270 protected virtual ScenePresence WaitGetScenePresence(UUID agentID) 4270 protected virtual ScenePresence WaitGetScenePresence(UUID agentID)
4271 { 4271 {
4272 int ntimes = 10; 4272 int ntimes = 20;
4273 ScenePresence sp = null; 4273 ScenePresence sp = null;
4274 while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0)) 4274 while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0))
4275 Thread.Sleep(1000); 4275 Thread.Sleep(1000);