aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting/LoadImageURL
diff options
context:
space:
mode:
authorMelanie2010-01-29 07:20:13 +0000
committerMelanie2010-01-29 07:20:13 +0000
commitcfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac (patch)
tree43f3fd01f30651d482f81b5ae7c25fd84cc8ca37 /OpenSim/Region/CoreModules/Scripting/LoadImageURL
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.zip
opensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.tar.gz
opensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.tar.bz2
opensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.tar.xz
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LoadImageURL')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs37
1 files changed, 12 insertions, 25 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 35ce2cb..c23cea5 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -29,7 +29,6 @@ using System;
29using System.Drawing; 29using System.Drawing;
30using System.IO; 30using System.IO;
31using System.Net; 31using System.Net;
32using Mono.Addins;
33using Nini.Config; 32using Nini.Config;
34using OpenMetaverse; 33using OpenMetaverse;
35using OpenMetaverse.Imaging; 34using OpenMetaverse.Imaging;
@@ -40,8 +39,7 @@ using System.Reflection;
40 39
41namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL 40namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
42{ 41{
43 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] 42 public class LoadImageURLModule : IRegionModule, IDynamicTextureRender
44 public class LoadImageURLModule : ISharedRegionModule, IDynamicTextureRender
45 { 43 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 45
@@ -99,28 +97,20 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
99 97
100 #endregion 98 #endregion
101 99
102 #region ISharedRegionModule Members 100 #region IRegionModule Members
103 101
104 public void Initialise(IConfigSource config) 102 public void Initialise(Scene scene, IConfigSource config)
105 {
106 m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
107 m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
108 }
109
110 public void AddRegion(Scene scene)
111 { 103 {
112 if (m_scene == null) 104 if (m_scene == null)
113 { 105 {
114 m_scene = scene; 106 m_scene = scene;
115 } 107 }
108
109 m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
110 m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
116 } 111 }
117 112
118 public Type ReplaceableInterface 113 public void PostInitialise()
119 {
120 get { return null; }
121 }
122
123 public void RegionLoaded(Scene scene)
124 { 114 {
125 m_textureManager = m_scene.RequestModuleInterface<IDynamicTextureManager>(); 115 m_textureManager = m_scene.RequestModuleInterface<IDynamicTextureManager>();
126 if (m_textureManager != null) 116 if (m_textureManager != null)
@@ -129,14 +119,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
129 } 119 }
130 } 120 }
131 121
132 public void RemoveRegion(Scene scene)
133 {
134 }
135
136 public void PostInitialise()
137 {
138 }
139
140 public void Close() 122 public void Close()
141 { 123 {
142 } 124 }
@@ -146,6 +128,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
146 get { return m_name; } 128 get { return m_name; }
147 } 129 }
148 130
131 public bool IsSharedModule
132 {
133 get { return true; }
134 }
135
149 #endregion 136 #endregion
150 137
151 private void MakeHttpRequest(string url, UUID requestID) 138 private void MakeHttpRequest(string url, UUID requestID)