diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Interfaces/IHttpRequests.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 11 |
2 files changed, 23 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs new file mode 100644 index 0000000..2294631 --- /dev/null +++ b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs | |||
@@ -0,0 +1,12 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using libsecondlife; | ||
5 | |||
6 | namespace OpenSim.Region.Environment.Interfaces | ||
7 | { | ||
8 | public interface IHttpRequests | ||
9 | { | ||
10 | LLUUID MakeHttpRequest(string url, string type, string body); | ||
11 | } | ||
12 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index f8d17b4..dca4222 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -93,6 +93,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
93 | // this most likely shouldn't be handled as a API method like this, but doing it for testing purposes | 93 | // this most likely shouldn't be handled as a API method like this, but doing it for testing purposes |
94 | public ModuleAPIMethod2<bool, string, byte[]> AddXferFile = null; | 94 | public ModuleAPIMethod2<bool, string, byte[]> AddXferFile = null; |
95 | 95 | ||
96 | private IHttpRequests m_httpRequestModule = null; | ||
96 | private ISimChat m_simChatModule = null; | 97 | private ISimChat m_simChatModule = null; |
97 | 98 | ||
98 | #region Properties | 99 | #region Properties |
@@ -196,6 +197,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
196 | public void SetModuleInterfaces() | 197 | public void SetModuleInterfaces() |
197 | { | 198 | { |
198 | m_simChatModule = this.RequestModuleInterface<ISimChat>(); | 199 | m_simChatModule = this.RequestModuleInterface<ISimChat>(); |
200 | m_httpRequestModule = this.RequestModuleInterface<IHttpRequests>(); | ||
199 | 201 | ||
200 | //should change so it uses the module interface functions | 202 | //should change so it uses the module interface functions |
201 | AddXferFile = (ModuleAPIMethod2<bool, string, byte[]>)this.RequestAPIMethod("API_AddXferFile"); | 203 | AddXferFile = (ModuleAPIMethod2<bool, string, byte[]>)this.RequestAPIMethod("API_AddXferFile"); |
@@ -1318,6 +1320,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
1318 | } | 1320 | } |
1319 | } | 1321 | } |
1320 | 1322 | ||
1323 | public LLUUID MakeHttpRequest(string url, string type, string body) | ||
1324 | { | ||
1325 | if (m_httpRequestModule != null) | ||
1326 | { | ||
1327 | return m_httpRequestModule.MakeHttpRequest(url, type, body); | ||
1328 | } | ||
1329 | return LLUUID.Zero; | ||
1330 | } | ||
1331 | |||
1321 | #region Script Engine | 1332 | #region Script Engine |
1322 | private List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface> ScriptEngines = new List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface>(); | 1333 | private List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface> ScriptEngines = new List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface>(); |
1323 | public void AddScriptEngine(OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine, LogBase m_logger) | 1334 | public void AddScriptEngine(OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine, LogBase m_logger) |