diff options
| author | Melanie Thielker | 2014-08-11 18:45:39 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-08-11 18:45:39 +0200 |
| commit | 22d472e34a8f789fdefc2bf7f0d6e859f8f83303 (patch) | |
| tree | fa73dec548fb0a83170865b2ae08d602789b99c3 /OpenSim/Capabilities | |
| parent | Merge branch 'avination-current' (diff) | |
| parent | remove a land.SendLandUpdateToClient() since its now done for all cases in (diff) | |
| download | opensim-SC-22d472e34a8f789fdefc2bf7f0d6e859f8f83303.zip opensim-SC-22d472e34a8f789fdefc2bf7f0d6e859f8f83303.tar.gz opensim-SC-22d472e34a8f789fdefc2bf7f0d6e859f8f83303.tar.bz2 opensim-SC-22d472e34a8f789fdefc2bf7f0d6e859f8f83303.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Capabilities/Caps.cs | 3 |
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 | |||
| 139 | m_agentID = agent; | 139 | m_agentID = agent; |
| 140 | m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL); | 140 | m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL); |
| 141 | m_regionName = regionName; | 141 | m_regionName = regionName; |
| 142 | m_capsActive.Reset(); | ||
| 142 | } | 143 | } |
| 143 | 144 | ||
| 144 | /// <summary> | 145 | /// <summary> |
| @@ -263,7 +264,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 263 | public bool WaitForActivation() | 264 | public bool WaitForActivation() |
| 264 | { | 265 | { |
| 265 | // Wait for 30s. If that elapses, return false and run without caps | 266 | // Wait for 30s. If that elapses, return false and run without caps |
| 266 | return m_capsActive.WaitOne(30000); | 267 | return m_capsActive.WaitOne(120000); |
| 267 | } | 268 | } |
| 268 | } | 269 | } |
| 269 | } \ No newline at end of file | 270 | } \ No newline at end of file |