diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index e331b8d..d78931a 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -31,7 +31,6 @@ using System.IO; | |||
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Text; | 32 | using System.Text; |
33 | using System.Threading; | 33 | using System.Threading; |
34 | using Mono.Addins; | ||
35 | using Nini.Config; | 34 | using Nini.Config; |
36 | using OpenMetaverse; | 35 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
@@ -85,8 +84,7 @@ using OpenSim.Region.Framework.Scenes; | |||
85 | 84 | ||
86 | namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | 85 | namespace OpenSim.Region.CoreModules.Scripting.HttpRequest |
87 | { | 86 | { |
88 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 87 | public class HttpRequestModule : IRegionModule, IHttpRequestModule |
89 | public class HttpRequestModule : ISharedRegionModule, IHttpRequestModule | ||
90 | { | 88 | { |
91 | private object HttpListLock = new object(); | 89 | private object HttpListLock = new object(); |
92 | private int httpTimeout = 30000; | 90 | private int httpTimeout = 30000; |
@@ -231,35 +229,18 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
231 | 229 | ||
232 | #endregion | 230 | #endregion |
233 | 231 | ||
234 | #region ISharedRegionModule Members | 232 | #region IRegionModule Members |
235 | 233 | ||
236 | public void Initialise(IConfigSource config) | 234 | public void Initialise(Scene scene, IConfigSource config) |
237 | { | ||
238 | m_proxyurl = config.Configs["Startup"].GetString("HttpProxy"); | ||
239 | m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions"); | ||
240 | |||
241 | m_pendingRequests = new Dictionary<UUID, HttpRequestClass>(); | ||
242 | } | ||
243 | |||
244 | public void AddRegion(Scene scene) | ||
245 | { | 235 | { |
246 | m_scene = scene; | 236 | m_scene = scene; |
247 | 237 | ||
248 | m_scene.RegisterModuleInterface<IHttpRequestModule>(this); | 238 | m_scene.RegisterModuleInterface<IHttpRequestModule>(this); |
249 | } | ||
250 | |||
251 | public Type ReplaceableInterface | ||
252 | { | ||
253 | get { return null; } | ||
254 | } | ||
255 | 239 | ||
256 | public void RegionLoaded(Scene scene) | 240 | m_proxyurl = config.Configs["Startup"].GetString("HttpProxy"); |
257 | { | 241 | m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions"); |
258 | } | ||
259 | 242 | ||
260 | public void RemoveRegion(Scene scene) | 243 | m_pendingRequests = new Dictionary<UUID, HttpRequestClass>(); |
261 | { | ||
262 | scene.UnregisterModuleInterface<IHttpRequestModule>(this); | ||
263 | } | 244 | } |
264 | 245 | ||
265 | public void PostInitialise() | 246 | public void PostInitialise() |
@@ -275,6 +256,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
275 | get { return m_name; } | 256 | get { return m_name; } |
276 | } | 257 | } |
277 | 258 | ||
259 | public bool IsSharedModule | ||
260 | { | ||
261 | get { return true; } | ||
262 | } | ||
263 | |||
278 | #endregion | 264 | #endregion |
279 | } | 265 | } |
280 | 266 | ||