ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into httptests

Browse Source 
# Conflicts:
#	prebuild.xml
This commit is contained in:
UbitUmarov
2017-12-12 22:19:31 +00:00
parent 17c65d918a d32debe618
commit ab0f866087
25 changed files with 1403 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -4632,10 +4632,10 @@ Label_GroupsDone:
/// <param name='agentID'></param>
protected virtual ScenePresence WaitGetScenePresence(UUID agentID)
{
int ntimes = 30;
int ntimes = 120; // 30s
ScenePresence sp = null;
while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0))
Thread.Sleep(1000);
Thread.Sleep(250);
if (sp == null)
m_log.WarnFormat(