aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Caps.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Capabilities/Caps.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs
index bc6f6f9..241fef3 100644
--- a/OpenSim/Capabilities/Caps.cs
+++ b/OpenSim/Capabilities/Caps.cs
@@ -30,6 +30,7 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Threading;
33using log4net; 34using log4net;
34using Nini.Config; 35using Nini.Config;
35using OpenMetaverse; 36using OpenMetaverse;
@@ -68,6 +69,7 @@ namespace OpenSim.Framework.Capabilities
68 private IHttpServer m_httpListener; 69 private IHttpServer m_httpListener;
69 private UUID m_agentID; 70 private UUID m_agentID;
70 private string m_regionName; 71 private string m_regionName;
72 private ManualResetEvent m_capsActive = new ManualResetEvent(false);
71 73
72 public UUID AgentID 74 public UUID AgentID
73 { 75 {
@@ -171,5 +173,16 @@ namespace OpenSim.Framework.Capabilities
171 } 173 }
172 } 174 }
173 } 175 }
176
177 public void Activate()
178 {
179 m_capsActive.Set();
180 }
181
182 public bool WaitForActivation()
183 {
184 // Wait for 30s. If that elapses, return false and run without caps
185 return m_capsActive.WaitOne(30000);
186 }
174 } 187 }
175} 188}