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

Fix an issue where the viewer would request the seed cap before

Browse Source 
there was a handler for it.
This commit is contained in:
Melanie
2013-02-18 21:09:14 +01:00
parent 13fe3546c3
commit 8c0b9080a4
5 changed files with 81 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Capabilities/Caps.cs
View File

@@ -30,6 +30,7 @@ using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Threading;
using log4net;
using Nini.Config;
using OpenMetaverse;
@@ -68,6 +69,7 @@ namespace OpenSim.Framework.Capabilities
private IHttpServer m_httpListener;
private UUID m_agentID;
private string m_regionName;
private ManualResetEvent m_capsActive = new ManualResetEvent(false);
public UUID AgentID
{
@@ -171,5 +173,16 @@ namespace OpenSim.Framework.Capabilities
}
}
}
public void Activate()
{
m_capsActive.Set();
}
public bool WaitForActivation()
{
// Wait for 30s. If that elapses, return false and run without caps
return m_capsActive.WaitOne(30000);
}
}
}