aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorThomas Grimshaw2010-04-07 22:59:13 +0200
committerThomas Grimshaw2010-04-07 22:59:13 +0200
commite80e04c5fd3892cf3c988baaa00aa8ccfa330256 (patch)
tree44e4924d0ad388adbc4d711f639b2c3cb33772e7 /OpenSim/Region/Framework
parentFix llDialog responses so that they can be heard throughout the region. This ... (diff)
downloadopensim-SC_OLD-e80e04c5fd3892cf3c988baaa00aa8ccfa330256.zip
opensim-SC_OLD-e80e04c5fd3892cf3c988baaa00aa8ccfa330256.tar.gz
opensim-SC_OLD-e80e04c5fd3892cf3c988baaa00aa8ccfa330256.tar.bz2
opensim-SC_OLD-e80e04c5fd3892cf3c988baaa00aa8ccfa330256.tar.xz
Increase the amount of time we wait for a teleport to complete. This allows teleportation to a remote region without a local connection to the asset server without timing out.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 5f84252..04626d3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1032,7 +1032,7 @@ namespace OpenSim.Region.Framework.Scenes
1032 1032
1033 public bool WaitForCallback(UUID id) 1033 public bool WaitForCallback(UUID id)
1034 { 1034 {
1035 int count = 200; 1035 int count = 400;
1036 while (m_agentsInTransit.Contains(id) && count-- > 0) 1036 while (m_agentsInTransit.Contains(id) && count-- > 0)
1037 { 1037 {
1038 //m_log.Debug(" >>> Waiting... " + count); 1038 //m_log.Debug(" >>> Waiting... " + count);