aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorubit2012-07-04 18:41:36 +0200
committerubit2012-07-04 18:41:36 +0200
commitc5d2151674f083f1021984c9cb97f1b2dfdb81cf (patch)
treec89d663463e6d6322ed8dc30f38192c9855302f1 /OpenSim/Region/CoreModules
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent added a timeout paramenter to PollServiceEventArgs, so each type can define ... (diff)
downloadopensim-SC-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.zip
opensim-SC-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.tar.gz
opensim-SC-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.tar.bz2
opensim-SC-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index a701b46..e93266c 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
174 174
175 m_HttpServer.AddPollServiceHTTPHandler( 175 m_HttpServer.AddPollServiceHTTPHandler(
176 uri, 176 uri,
177 new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); 177 new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode,25000));
178 178
179 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); 179 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
180 } 180 }
@@ -216,7 +216,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
216 216
217 m_HttpsServer.AddPollServiceHTTPHandler( 217 m_HttpsServer.AddPollServiceHTTPHandler(
218 uri, 218 uri,
219 new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); 219 new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode,25000));
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 }