diff options
| author | Melanie | 2013-06-07 23:55:03 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-07 23:55:03 +0100 |
| commit | 75631e0267dbf58253dfcf6327b4d65f35bbaa6d (patch) | |
| tree | 37521359907f2f015c6a51c43db711be16861e0f /OpenSim/Region/CoreModules | |
| parent | Adding Avination's PollService to round out the HTTP inventory changes (diff) | |
| download | opensim-SC_OLD-75631e0267dbf58253dfcf6327b4d65f35bbaa6d.zip opensim-SC_OLD-75631e0267dbf58253dfcf6327b4d65f35bbaa6d.tar.gz opensim-SC_OLD-75631e0267dbf58253dfcf6327b4d65f35bbaa6d.tar.bz2 opensim-SC_OLD-75631e0267dbf58253dfcf6327b4d65f35bbaa6d.tar.xz | |
Supply proper type information for the various types of requests
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 976ab93..def8162 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
| @@ -235,9 +235,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
| 235 | 235 | ||
| 236 | string uri = "/lslhttp/" + urlcode.ToString() + "/"; | 236 | string uri = "/lslhttp/" + urlcode.ToString() + "/"; |
| 237 | 237 | ||
| 238 | m_HttpServer.AddPollServiceHTTPHandler( | 238 | PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000); |
| 239 | uri, | 239 | args.Type = PollServiceEventArgs.EventType.LslHttp; |
| 240 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000)); | 240 | m_HttpServer.AddPollServiceHTTPHandler(uri, args); |
| 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}", |
| @@ -280,9 +280,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
| 280 | 280 | ||
| 281 | string uri = "/lslhttps/" + urlcode.ToString() + "/"; | 281 | string uri = "/lslhttps/" + urlcode.ToString() + "/"; |
| 282 | 282 | ||
| 283 | m_HttpsServer.AddPollServiceHTTPHandler( | 283 | PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000); |
| 284 | uri, | 284 | args.Type = PollServiceEventArgs.EventType.LslHttp; |
| 285 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000)); | 285 | m_HttpsServer.AddPollServiceHTTPHandler(uri, args); |
| 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}", |