diff options
author | Justin Clark-Casey (justincc) | 2013-08-09 17:59:58 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-08-09 17:59:58 +0100 |
commit | bfdcdbb2f3f568c3ef829f30b8326dbc8a835f03 (patch) | |
tree | 8a45cdbfcb93cea7541a4116c36d0d1a07cfd5bb /OpenSim/Region/Framework | |
parent | Add missing file from b1c26a56 (diff) | |
download | opensim-SC_OLD-bfdcdbb2f3f568c3ef829f30b8326dbc8a835f03.zip opensim-SC_OLD-bfdcdbb2f3f568c3ef829f30b8326dbc8a835f03.tar.gz opensim-SC_OLD-bfdcdbb2f3f568c3ef829f30b8326dbc8a835f03.tar.bz2 opensim-SC_OLD-bfdcdbb2f3f568c3ef829f30b8326dbc8a835f03.tar.xz |
Increase wait for source region to sent UpdateAgent to 10 seconds instead of 4.
This is giving much better results on teleports between simulators over my lan where for some reason there is a pause before the receiving simulator processes UpdateAgent()
At this point, v2 teleports between neighbour and non-neighbour regions on a single simulator and between v2 simulators and between a v1 and v2 simulator
are working okay for me in different scenarios (e.g. simple teleport, teleport back to original quickly and re-teleport, teleport back to neighbour and re-teleport. etc.)
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index aac80f7..69339b7 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1355,7 +1355,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1355 | private bool WaitForUpdateAgent(IClientAPI client) | 1355 | private bool WaitForUpdateAgent(IClientAPI client) |
1356 | { | 1356 | { |
1357 | // Before UpdateAgent, m_originRegionID is UUID.Zero; after, it's non-Zero | 1357 | // Before UpdateAgent, m_originRegionID is UUID.Zero; after, it's non-Zero |
1358 | int count = 20; | 1358 | int count = 50; |
1359 | while (m_originRegionID.Equals(UUID.Zero) && count-- > 0) | 1359 | while (m_originRegionID.Equals(UUID.Zero) && count-- > 0) |
1360 | { | 1360 | { |
1361 | m_log.DebugFormat("[SCENE PRESENCE]: Agent {0} waiting for update in {1}", client.Name, Scene.Name); | 1361 | m_log.DebugFormat("[SCENE PRESENCE]: Agent {0} waiting for update in {1}", client.Name, Scene.Name); |