diff options
author | Melanie Thielker | 2016-03-16 20:04:52 +0100 |
---|---|---|
committer | Melanie Thielker | 2016-03-16 20:04:52 +0100 |
commit | e8b46023e47399e9dcc0057a4380ca4fe49908ee (patch) | |
tree | aa384c79130605f8e5740f689a81226cc47f9335 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | Implement Access-Control-Allow-Origin for HTTP LSL server (diff) | |
download | opensim-SC-e8b46023e47399e9dcc0057a4380ca4fe49908ee.zip opensim-SC-e8b46023e47399e9dcc0057a4380ca4fe49908ee.tar.gz opensim-SC-e8b46023e47399e9dcc0057a4380ca4fe49908ee.tar.bz2 opensim-SC-e8b46023e47399e9dcc0057a4380ca4fe49908ee.tar.xz |
Add osRequestURL and osRequestSecureURL with an options list.
Only currently supported option is "allowXss" which will send the needed
Access-control-allow-origin: * header to allow xss scripting against
the LSL http server.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a2abbeb..f48d42d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -12039,7 +12039,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12039 | { | 12039 | { |
12040 | m_host.AddScriptLPS(1); | 12040 | m_host.AddScriptLPS(1); |
12041 | if (m_UrlModule != null) | 12041 | if (m_UrlModule != null) |
12042 | return m_UrlModule.RequestSecureURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID).ToString(); | 12042 | return m_UrlModule.RequestSecureURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID, null).ToString(); |
12043 | return UUID.Zero.ToString(); | 12043 | return UUID.Zero.ToString(); |
12044 | } | 12044 | } |
12045 | 12045 | ||
@@ -12157,7 +12157,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12157 | m_host.AddScriptLPS(1); | 12157 | m_host.AddScriptLPS(1); |
12158 | 12158 | ||
12159 | if (m_UrlModule != null) | 12159 | if (m_UrlModule != null) |
12160 | return m_UrlModule.RequestURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID).ToString(); | 12160 | return m_UrlModule.RequestURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID, null).ToString(); |
12161 | return UUID.Zero.ToString(); | 12161 | return UUID.Zero.ToString(); |
12162 | } | 12162 | } |
12163 | 12163 | ||