aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-07-15 01:05:04 +0200
committerMelanie2012-07-15 01:05:04 +0200
commitcaef55a6366477b093afd92dadff2c42528a4bc7 (patch)
tree36ab3297db8bc600a87285405bbda57e5b46fc13
parentReinstate sleeping because less CPU is preferred over reporting accuracy. (diff)
downloadopensim-SC_OLD-caef55a6366477b093afd92dadff2c42528a4bc7.zip
opensim-SC_OLD-caef55a6366477b093afd92dadff2c42528a4bc7.tar.gz
opensim-SC_OLD-caef55a6366477b093afd92dadff2c42528a4bc7.tar.bz2
opensim-SC_OLD-caef55a6366477b093afd92dadff2c42528a4bc7.tar.xz
Set up https to work like http does in the poll handler
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 9c5596b..c0c97c9 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -214,9 +214,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
214 214
215 string uri = "/lslhttps/" + urlcode.ToString() + "/"; 215 string uri = "/lslhttps/" + urlcode.ToString() + "/";
216 216
217 m_HttpsServer.AddPollServiceHTTPHandler( 217 PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000));
218 uri, 218 args.Type = PollServiceEventArgs.EventType.LslHttp;
219 new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode,25000)); 219 m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
220 220
221 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); 221 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
222 } 222 }