diff options
| author | UbitUmarov | 2017-12-12 22:19:31 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-12-12 22:19:31 +0000 |
| commit | ab0f866087f1565863ac516820761cb48386f96e (patch) | |
| tree | e15b415a9feee5f042f4ca7f8d9eb05f536fddad /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | commit what i did so far for core mutes module, befere i lose it (diff) | |
| download | opensim-SC-ab0f866087f1565863ac516820761cb48386f96e.zip opensim-SC-ab0f866087f1565863ac516820761cb48386f96e.tar.gz opensim-SC-ab0f866087f1565863ac516820761cb48386f96e.tar.bz2 opensim-SC-ab0f866087f1565863ac516820761cb48386f96e.tar.xz | |
Merge branch 'master' into httptests
# Conflicts:
# prebuild.xml
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c06b3dd..c223aae 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4632,10 +4632,10 @@ Label_GroupsDone: | |||
| 4632 | /// <param name='agentID'></param> | 4632 | /// <param name='agentID'></param> |
| 4633 | protected virtual ScenePresence WaitGetScenePresence(UUID agentID) | 4633 | protected virtual ScenePresence WaitGetScenePresence(UUID agentID) |
| 4634 | { | 4634 | { |
| 4635 | int ntimes = 30; | 4635 | int ntimes = 120; // 30s |
| 4636 | ScenePresence sp = null; | 4636 | ScenePresence sp = null; |
| 4637 | while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0)) | 4637 | while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0)) |
| 4638 | Thread.Sleep(1000); | 4638 | Thread.Sleep(250); |
| 4639 | 4639 | ||
| 4640 | if (sp == null) | 4640 | if (sp == null) |
| 4641 | m_log.WarnFormat( | 4641 | m_log.WarnFormat( |