diff options
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 192b4f6..7f2f147 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -184,9 +184,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
184 | 184 | ||
185 | string uri = "/lslhttp/" + urlcode.ToString(); | 185 | string uri = "/lslhttp/" + urlcode.ToString(); |
186 | 186 | ||
187 | m_HttpServer.AddPollServiceHTTPHandler( | 187 | PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000); |
188 | uri, | 188 | args.Type = PollServiceEventArgs.EventType.LslHttp; |
189 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); | 189 | m_HttpServer.AddPollServiceHTTPHandler(uri, args); |
190 | 190 | ||
191 | m_log.DebugFormat( | 191 | m_log.DebugFormat( |
192 | "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}", | 192 | "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}", |
@@ -232,7 +232,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
232 | 232 | ||
233 | m_HttpsServer.AddPollServiceHTTPHandler( | 233 | m_HttpsServer.AddPollServiceHTTPHandler( |
234 | uri, | 234 | uri, |
235 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); | 235 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode,25000)); |
236 | 236 | ||
237 | m_log.DebugFormat( | 237 | m_log.DebugFormat( |
238 | "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}", | 238 | "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}", |
@@ -446,7 +446,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
446 | } | 446 | } |
447 | private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) | 447 | private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) |
448 | { | 448 | { |
449 | UrlData url = null; | 449 | UrlData url = null; |
450 | RequestData requestData = null; | 450 | RequestData requestData = null; |
451 | 451 | ||
452 | lock (m_RequestMap) | 452 | lock (m_RequestMap) |