diff options
author | Melanie | 2013-06-07 23:43:45 +0100 |
---|---|---|
committer | Melanie | 2013-06-07 23:43:45 +0100 |
commit | 7c0bfca7a03584dd65c5659f177b434ee94ddc9d (patch) | |
tree | 82ceefae330b2c2b80a20db68abd79ae2439b034 /OpenSim/Region/CoreModules/Scripting | |
parent | minor: add dr0berts to contributors list (diff) | |
download | opensim-SC-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.zip opensim-SC-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.tar.gz opensim-SC-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.tar.bz2 opensim-SC-7c0bfca7a03584dd65c5659f177b434ee94ddc9d.tar.xz |
Adding Avination's PollService to round out the HTTP inventory changes
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index c9cd412..976ab93 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
237 | 237 | ||
238 | m_HttpServer.AddPollServiceHTTPHandler( | 238 | m_HttpServer.AddPollServiceHTTPHandler( |
239 | uri, | 239 | uri, |
240 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); | 240 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000)); |
241 | 241 | ||
242 | m_log.DebugFormat( | 242 | m_log.DebugFormat( |
243 | "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}", | 243 | "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}", |
@@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
282 | 282 | ||
283 | m_HttpsServer.AddPollServiceHTTPHandler( | 283 | m_HttpsServer.AddPollServiceHTTPHandler( |
284 | uri, | 284 | uri, |
285 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); | 285 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000)); |
286 | 286 | ||
287 | m_log.DebugFormat( | 287 | m_log.DebugFormat( |
288 | "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}", | 288 | "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}", |
@@ -516,7 +516,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
516 | } | 516 | } |
517 | } | 517 | } |
518 | 518 | ||
519 | private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) | 519 | private Hashtable GetEvents(UUID requestID, UUID sessionID) |
520 | { | 520 | { |
521 | Hashtable response; | 521 | Hashtable response; |
522 | 522 | ||
@@ -668,4 +668,4 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
668 | ScriptRemoved(itemID); | 668 | ScriptRemoved(itemID); |
669 | } | 669 | } |
670 | } | 670 | } |
671 | } \ No newline at end of file | 671 | } |