diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index e93266c..9c5596b 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -172,9 +172,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
172 | 172 | ||
173 | string uri = "/lslhttp/" + urlcode.ToString(); | 173 | string uri = "/lslhttp/" + urlcode.ToString(); |
174 | 174 | ||
175 | m_HttpServer.AddPollServiceHTTPHandler( | 175 | PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000); |
176 | uri, | 176 | args.Type = PollServiceEventArgs.EventType.LslHttp; |
177 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode,25000)); | 177 | m_HttpServer.AddPollServiceHTTPHandler(uri, args); |
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 | } |
@@ -422,7 +422,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
422 | } | 422 | } |
423 | private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) | 423 | private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) |
424 | { | 424 | { |
425 | UrlData url = null; | 425 | UrlData url = null; |
426 | RequestData requestData = null; | 426 | RequestData requestData = null; |
427 | 427 | ||
428 | lock (m_RequestMap) | 428 | lock (m_RequestMap) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index fd8e586..5808594 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7479,7 +7479,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7479 | public LSL_String llSHA1String(string src) | 7479 | public LSL_String llSHA1String(string src) |
7480 | { | 7480 | { |
7481 | m_host.AddScriptLPS(1); | 7481 | m_host.AddScriptLPS(1); |
7482 | return Util.SHA1Hash(src, Encoding.UTF8).ToUpper(); | 7482 | return Util.SHA1Hash(src, Encoding.UTF8).ToLower(); |
7483 | } | 7483 | } |
7484 | 7484 | ||
7485 | protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve) | 7485 | protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve) |