diff options
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index ad5af1f..a3a5029 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -1809,6 +1809,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1809 | 1809 | ||
1810 | public void httpServerException(object source, Exception exception) | 1810 | public void httpServerException(object source, Exception exception) |
1811 | { | 1811 | { |
1812 | if (source.ToString() == "HttpServer.HttpListener" && exception.ToString().StartsWith("Mono.Security.Protocol.Tls.TlsException")) | ||
1813 | return; | ||
1812 | m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString()); | 1814 | m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString()); |
1813 | /* | 1815 | /* |
1814 | if (HTTPDRunning)// && NotSocketErrors > 5) | 1816 | if (HTTPDRunning)// && NotSocketErrors > 5) |
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 9c5596b..dcf49a7 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -199,7 +199,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
199 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" }); | 199 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" }); |
200 | return urlcode; | 200 | return urlcode; |
201 | } | 201 | } |
202 | string url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString() + "/"; | 202 | string url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString(); |
203 | 203 | ||
204 | UrlData urlData = new UrlData(); | 204 | UrlData urlData = new UrlData(); |
205 | urlData.hostID = host.UUID; | 205 | urlData.hostID = host.UUID; |
@@ -212,11 +212,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
212 | 212 | ||
213 | m_UrlMap[url] = urlData; | 213 | m_UrlMap[url] = urlData; |
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 | } |
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 1104f45..139c4e8 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
@@ -1238,7 +1238,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1238 | { | 1238 | { |
1239 | if (!prm.m_outbounds) | 1239 | if (!prm.m_outbounds) |
1240 | { | 1240 | { |
1241 | // if (d.BodyIsEnabled(prm.Body)) | 1241 | if (d.BodyIsEnabled(prm.Body)) |
1242 | d.SpaceCollide2(StaticSpace, prm.collide_geom, IntPtr.Zero, nearCallback); | 1242 | d.SpaceCollide2(StaticSpace, prm.collide_geom, IntPtr.Zero, nearCallback); |
1243 | } | 1243 | } |
1244 | } | 1244 | } |