OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

explicitly force a reset to the event on creation 

#Please enter the commit message for your changes. Lines starting
avinationmerge
UbitUmarov 2014-08-09 15:08:21 +01:00
parent ddfb05e57a
commit 74efe1e393
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Capabilities/Caps.cs
View File

@ -139,6 +139,7 @@ namespace OpenSim.Framework.Capabilities
m_agentID = agent; m_agentID = agent;
m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL); m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL);
m_regionName = regionName; m_regionName = regionName;
m_capsActive.Reset();
} }
/// <summary> /// <summary>
@ -263,7 +264,7 @@ namespace OpenSim.Framework.Capabilities
public bool WaitForActivation() public bool WaitForActivation()
{ {
// Wait for 30s. If that elapses, return false and run without caps // Wait for 30s. If that elapses, return false and run without caps
return m_capsActive.WaitOne(30000); return m_capsActive.WaitOne(120000);
} }
} }
} }