Revert "Updates all IRegionModules to the new style region modules."

This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.

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;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
@@ -41,8 +40,7 @@ using System.Reflection;
 
 namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class DynamicTextureModule : ISharedRegionModule, IDynamicTextureManager
+    public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
     {
         //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -212,14 +210,9 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
         #endregion
 
-        #region ISharedRegionModule Members
+        #region IRegionModule Members
 
-        public void Initialise(IConfigSource config)
-        {
-            
-        }
-
-        public void AddRegion(Scene scene)
+        public void Initialise(Scene scene, IConfigSource config)
         {
             if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
             {
@@ -228,24 +221,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
             }
         }
 
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
-            {
-                RegisteredScenes.Remove(scene.RegionInfo.RegionID);
-                scene.UnregisterModuleInterface<IDynamicTextureManager>(this);
-            }
-        }
-
         public void PostInitialise()
         {
         }
@@ -259,6 +234,11 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
             get { return "DynamicTextureModule"; }
         }
 
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+
         #endregion
 
         #region Nested type: DynamicTextureUpdater
@@ -378,18 +358,18 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                     // tmptex.DefaultTexture.Fullbright = true;
 
                     part.UpdateTexture(tmptex);
-                }
-
-                if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
-                {
-                    if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());
-                    if (oldAsset != null)
-                    {
-                        if (oldAsset.Temporary == true)
-                        {
-                            scene.AssetService.Delete(oldID.ToString());
-                        }
-                    }
+                }

+

+                if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))

+                {

+                    if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());

+                    if (oldAsset != null)

+                    {

+                        if (oldAsset.Temporary == true)

+                        {

+                            scene.AssetService.Delete(oldID.ToString());

+                        }

+                    }

                 }
             }