aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
diff options
context:
space:
mode:
authorMelanie2012-09-10 13:53:00 +0100
committerMelanie2012-09-10 13:53:00 +0100
commit21c476228a1dbeef1f180a16e9ebb47c8b3fa185 (patch)
tree5a2fc5d269eb4711fa2ace11d04731e7dc08607b /OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
parentMerge branch 'master' into careminster (diff)
parentRemove commented code (diff)
downloadopensim-SC_OLD-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.zip
opensim-SC_OLD-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.gz
opensim-SC_OLD-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.bz2
opensim-SC_OLD-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 32a4c88..99ffbe7 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -189,9 +189,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
189 args.Type = PollServiceEventArgs.EventType.LslHttp; 189 args.Type = PollServiceEventArgs.EventType.LslHttp;
190 m_HttpServer.AddPollServiceHTTPHandler(uri, args); 190 m_HttpServer.AddPollServiceHTTPHandler(uri, args);
191 191
192 m_log.DebugFormat( 192// m_log.DebugFormat(
193 "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}", 193// "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}",
194 uri, itemID, host.Name, host.LocalId); 194// uri, itemID, host.Name, host.LocalId);
195 195
196 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); 196 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
197 } 197 }
@@ -235,9 +235,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
235 args.Type = PollServiceEventArgs.EventType.LslHttp; 235 args.Type = PollServiceEventArgs.EventType.LslHttp;
236 m_HttpsServer.AddPollServiceHTTPHandler(uri, args); 236 m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
237 237
238 m_log.DebugFormat( 238// m_log.DebugFormat(
239 "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}", 239// "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",
240 uri, itemID, host.Name, host.LocalId); 240// uri, itemID, host.Name, host.LocalId);
241 241
242 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); 242 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
243 } 243 }