From b16abc8166c29585cb76cc55c3bdd76e5833cb4f Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 5 Jan 2017 19:07:37 +0000 Subject: Massive tab and trailing space cleanup --- .../CoreModules/Scripting/LSLHttp/UrlModule.cs | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'OpenSim/Region/CoreModules/Scripting/LSLHttp') diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index f563c68..bb80a88 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs @@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp /// public int TotalUrls { get; set; } - public Type ReplaceableInterface + public Type ReplaceableInterface { get { return null; } } @@ -221,10 +221,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp urlData.allowXss = true; m_UrlMap[url] = urlData; - + string uri = "/lslhttp/" + urlcode.ToString() + "/"; - - PollServiceEventArgs args + + PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000); args.Type = PollServiceEventArgs.EventType.LslHttp; m_HttpServer.AddPollServiceHTTPHandler(uri, args); @@ -270,12 +270,12 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp if (options != null && options["allowXss"] != null) urlData.allowXss = true; - + m_UrlMap[url] = urlData; - + string uri = "/lslhttps/" + urlcode.ToString() + "/"; - - PollServiceEventArgs args + + PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000); args.Type = PollServiceEventArgs.EventType.LslHttp; m_HttpsServer.AddPollServiceHTTPHandler(uri, args); @@ -306,7 +306,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp foreach (UUID req in data.requests.Keys) m_RequestMap.Remove(req); } - + // m_log.DebugFormat( // "[URL MODULE]: Releasing url {0} for {1} in {2}", // url, data.itemID, data.hostID); @@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp m_UrlMap.Remove(url); } } - + public void HttpContentType(UUID request, string type) { lock (m_UrlMap) @@ -331,7 +331,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp } } } - + public void HttpResponse(UUID request, int status, string body) { lock (m_RequestMap) @@ -403,7 +403,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp public void ScriptRemoved(UUID itemID) { // m_log.DebugFormat("[URL MODULE]: Removing script {0}", itemID); - + lock (m_UrlMap) { List removeURLs = new List(); @@ -495,14 +495,14 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp return response; } - + return response; } private bool HasEvents(UUID requestID, UUID sessionID) { UrlData url=null; - + lock (m_RequestMap) { if (!m_RequestMap.ContainsKey(requestID)) @@ -545,10 +545,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp { requestData = url.requests[requestID]; } - + if (!requestData.requestDone) return NoEvents(requestID,sessionID); - + Hashtable response = new Hashtable(); if (System.Environment.TickCount - requestData.startTime > 25000) @@ -569,7 +569,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp if (url.allowXss) response["access_control_allow_origin"] = "*"; - + //remove from map lock (url.requests) { @@ -627,7 +627,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp } //for llGetHttpHeader support we need to store original URI here - //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers + //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers //as per http://wiki.secondlife.com/wiki/LlGetHTTPHeader RequestData requestData = new RequestData(); @@ -689,7 +689,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp else { queryString = queryString + val + "&"; - } + } } } if (queryString.Length > 1) -- cgit v1.1