diff options
author | Melanie | 2010-01-29 07:20:13 +0000 |
---|---|---|
committer | Melanie | 2010-01-29 07:21:06 +0000 |
commit | a87a247f0548d39a8c39b1d28123d7da8db44598 (patch) | |
tree | 7f9f77c38a224bc6d4bea7ccced1d4710c8a91b1 /OpenSim/Region/CoreModules/Scripting/DynamicTexture | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.zip opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.gz opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.bz2 opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.xz |
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/DynamicTexture')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 60 |
1 files changed, 20 insertions, 40 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index 40b7159..679c871 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -29,7 +29,6 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Drawing; | 30 | using System.Drawing; |
31 | using System.Drawing.Imaging; | 31 | using System.Drawing.Imaging; |
32 | using Mono.Addins; | ||
33 | using Nini.Config; | 32 | using Nini.Config; |
34 | using OpenMetaverse; | 33 | using OpenMetaverse; |
35 | using OpenMetaverse.Imaging; | 34 | using OpenMetaverse.Imaging; |
@@ -41,8 +40,7 @@ using System.Reflection; | |||
41 | 40 | ||
42 | namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | 41 | namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture |
43 | { | 42 | { |
44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 43 | public class DynamicTextureModule : IRegionModule, IDynamicTextureManager |
45 | public class DynamicTextureModule : ISharedRegionModule, IDynamicTextureManager | ||
46 | { | 44 | { |
47 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 46 | ||
@@ -212,14 +210,9 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
212 | 210 | ||
213 | #endregion | 211 | #endregion |
214 | 212 | ||
215 | #region ISharedRegionModule Members | 213 | #region IRegionModule Members |
216 | 214 | ||
217 | public void Initialise(IConfigSource config) | 215 | public void Initialise(Scene scene, IConfigSource config) |
218 | { | ||
219 | |||
220 | } | ||
221 | |||
222 | public void AddRegion(Scene scene) | ||
223 | { | 216 | { |
224 | if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) | 217 | if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) |
225 | { | 218 | { |
@@ -228,24 +221,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
228 | } | 221 | } |
229 | } | 222 | } |
230 | 223 | ||
231 | public Type ReplaceableInterface | ||
232 | { | ||
233 | get { return null; } | ||
234 | } | ||
235 | |||
236 | public void RegionLoaded(Scene scene) | ||
237 | { | ||
238 | } | ||
239 | |||
240 | public void RemoveRegion(Scene scene) | ||
241 | { | ||
242 | if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) | ||
243 | { | ||
244 | RegisteredScenes.Remove(scene.RegionInfo.RegionID); | ||
245 | scene.UnregisterModuleInterface<IDynamicTextureManager>(this); | ||
246 | } | ||
247 | } | ||
248 | |||
249 | public void PostInitialise() | 224 | public void PostInitialise() |
250 | { | 225 | { |
251 | } | 226 | } |
@@ -259,6 +234,11 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
259 | get { return "DynamicTextureModule"; } | 234 | get { return "DynamicTextureModule"; } |
260 | } | 235 | } |
261 | 236 | ||
237 | public bool IsSharedModule | ||
238 | { | ||
239 | get { return true; } | ||
240 | } | ||
241 | |||
262 | #endregion | 242 | #endregion |
263 | 243 | ||
264 | #region Nested type: DynamicTextureUpdater | 244 | #region Nested type: DynamicTextureUpdater |
@@ -378,18 +358,18 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
378 | // tmptex.DefaultTexture.Fullbright = true; | 358 | // tmptex.DefaultTexture.Fullbright = true; |
379 | 359 | ||
380 | part.UpdateTexture(tmptex); | 360 | part.UpdateTexture(tmptex); |
381 | } | 361 | } |
382 | 362 | ||
383 | if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0)) | 363 | if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0)) |
384 | { | 364 | { |
385 | if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString()); | 365 | if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString()); |
386 | if (oldAsset != null) | 366 | if (oldAsset != null) |
387 | { | 367 | { |
388 | if (oldAsset.Temporary == true) | 368 | if (oldAsset.Temporary == true) |
389 | { | 369 | { |
390 | scene.AssetService.Delete(oldID.ToString()); | 370 | scene.AssetService.Delete(oldID.ToString()); |
391 | } | 371 | } |
392 | } | 372 | } |
393 | } | 373 | } |
394 | } | 374 | } |
395 | 375 | ||