1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs
index 30a323e..b35e6b4 100644
--- a/OpenSim/Capabilities/Caps.cs
+++ b/OpenSim/Capabilities/Caps.cs
@@ -139,6 +139,7 @@ namespace OpenSim.Framework.Capabilities
             m_agentID = agent;
             m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL);
             m_regionName = regionName;
+            m_capsActive.Reset();
         }
 
         /// <summary>
@@ -263,7 +264,7 @@ namespace OpenSim.Framework.Capabilities
         public bool WaitForActivation()
         {
             // Wait for 30s. If that elapses, return false and run without caps
-            return m_capsActive.WaitOne(30000);
+            return m_capsActive.WaitOne(120000);
         }
     }
 }
\ No newline at end of file