Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

2 files changed, 78 insertions, 64 deletions

diff --git a/OpenSim/Region/CoreModules/LightShare/EnvironmentModule.cs b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
index 1526886..c3cea7a 100644
--- a/OpenSim/Region/CoreModules/LightShare/EnvironmentModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
@@ -51,10 +51,10 @@ namespace OpenSim.Region.CoreModules.World.LightShare
         private Scene m_scene = null;
         private UUID regionID = UUID.Zero;
         private static bool Enabled = false;
-        
+
         private static readonly string capsName = "EnvironmentSettings";
         private static readonly string capsBase = "/CAPS/0020/";
-        
+
         private LLSDEnvironmentSetResponse setResponse = null;
 
         #region INonSharedRegionModule
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
             }
 
             Enabled = true;
-            
+
             m_log.InfoFormat("[{0}]: Module is enabled.", Name);
         }
 
@@ -132,8 +132,8 @@ namespace OpenSim.Region.CoreModules.World.LightShare
         #region Events
         private void OnRegisterCaps(UUID agentID, Caps caps)
         {
-//            m_log.DebugFormat("[{0}]: Register capability for agentID {1} in region {2}",
-//                Name, agentID, caps.RegionName);
+            //            m_log.DebugFormat("[{0}]: Register capability for agentID {1} in region {2}",
+            //                Name, agentID, caps.RegionName);
 
             string capsPath = capsBase + UUID.Random();
 
@@ -163,8 +163,8 @@ namespace OpenSim.Region.CoreModules.World.LightShare
         private string GetEnvironmentSettings(string request, string path, string param,
               UUID agentID, Caps caps)
         {
-//            m_log.DebugFormat("[{0}]: Environment GET handle for agentID {1} in region {2}",
-//                Name, agentID, caps.RegionName);
+            //            m_log.DebugFormat("[{0}]: Environment GET handle for agentID {1} in region {2}",
+            //                Name, agentID, caps.RegionName);
 
             string env = String.Empty;
 
@@ -188,8 +188,8 @@ namespace OpenSim.Region.CoreModules.World.LightShare
                               UUID agentID, Caps caps)
         {
 
-//            m_log.DebugFormat("[{0}]: Environment SET handle from agentID {1} in region {2}",
-//                Name, agentID, caps.RegionName);
+            //            m_log.DebugFormat("[{0}]: Environment SET handle from agentID {1} in region {2}",
+            //                Name, agentID, caps.RegionName);
 
             setResponse.regionID = regionID;
             setResponse.success = false;
@@ -204,7 +204,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
             {
                 m_scene.SimulationDataService.StoreRegionEnvironmentSettings(regionID, request);
                 setResponse.success = true;
-                
+
                 m_log.InfoFormat("[{0}]: New Environment settings has been saved from agentID {1} in region {2}",
                     Name, agentID, caps.RegionName);
             }
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
index 16cbbf5..bd04ded 100644
--- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
@@ -27,21 +27,20 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
 using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-
+using log4net;
+using Nini.Config;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.World.LightShare
 {
-    public class LightShareModule : IRegionModule, ICommandableModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class LightShareModule : INonSharedRegionModule, ILightShareModule, ICommandableModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private readonly Commander m_commander = new Commander("windlight");
@@ -57,48 +56,86 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         #endregion
 
-        #region IRegionModule Members
+        #region INonSharedRegionModule Members
 
-        public static bool EnableWindlight
+        public void Initialise(IConfigSource config)
         {
-            get
+            try
             {
-                return m_enableWindlight;
+                m_enableWindlight = config.Configs["LightShare"].GetBoolean("enable_windlight", false);
             }
-            set
+            catch (Exception)
             {
+                m_log.Debug("[WINDLIGHT]: ini failure for enable_windlight - using default");
             }
+
+            m_log.DebugFormat("[WINDLIGHT]: windlight module {0}", (m_enableWindlight ? "enabled" : "disabled"));
         }
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void AddRegion(Scene scene)
         {
+            if (!m_enableWindlight)
+                return;
+
             m_scene = scene;
-            m_scene.RegisterModuleInterface<IRegionModule>(this);
+            m_scene.RegisterModuleInterface<ILightShareModule>(this);
             m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
 
-            // ini file settings
-            try
-            {
-                m_enableWindlight = config.Configs["LightShare"].GetBoolean("enable_windlight", false);
-            }
-            catch (Exception)
+            m_scene.EventManager.OnMakeRootAgent += EventManager_OnMakeRootAgent;
+            m_scene.EventManager.OnSaveNewWindlightProfile += EventManager_OnSaveNewWindlightProfile;
+            m_scene.EventManager.OnSendNewWindlightProfileTargeted += EventManager_OnSendNewWindlightProfileTargeted;
+            m_scene.LoadWindlightProfile();
+
+            InstallCommands();
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_enableWindlight)
+                return;
+
+            m_scene.EventManager.OnPluginConsole -= EventManager_OnPluginConsole;
+
+            m_scene.EventManager.OnMakeRootAgent -= EventManager_OnMakeRootAgent;
+            m_scene.EventManager.OnSaveNewWindlightProfile -= EventManager_OnSaveNewWindlightProfile;
+            m_scene.EventManager.OnSendNewWindlightProfileTargeted -= EventManager_OnSendNewWindlightProfileTargeted;
+
+            m_scene = null;
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "LightShareModule"; }
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        #endregion
+
+        public static bool EnableWindlight
+        {
+            get
             {
-                m_log.Debug("[WINDLIGHT]: ini failure for enable_windlight - using default");
+                return m_enableWindlight;
             }
-
-            if (m_enableWindlight)
+            set
             {
-                m_scene.EventManager.OnMakeRootAgent += EventManager_OnMakeRootAgent;
-                m_scene.EventManager.OnSaveNewWindlightProfile += EventManager_OnSaveNewWindlightProfile;
-                m_scene.EventManager.OnSendNewWindlightProfileTargeted += EventManager_OnSendNewWindlightProfileTargeted;
-                m_scene.LoadWindlightProfile();
             }
-
-            InstallCommands();
-
-            m_log.Debug("[WINDLIGHT]: Initialised windlight module");
         }
 
+        #region events
+
         private List<byte[]> compileWindlightSettings(RegionLightShareData wl)
         {
             byte[] mBlock = new Byte[249];
@@ -186,29 +223,6 @@ namespace OpenSim.Region.CoreModules.World.LightShare
             m_scene.ForEachRootClient(SendProfileToClient);
         }
 
-        public void PostInitialise()
-        {
-
-        }
-
-        public void Close()
-        {
-        }
-
-        public string Name
-        {
-            get { return "LightShareModule"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
-
-        #endregion
-
-        #region events
-
         #endregion
 
         #region ICommandableModule Members
@@ -243,7 +257,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
         private void HandleDisable(Object[] args)
         {
             m_log.InfoFormat("[WINDLIGHT]: Plugin now disabled");
-            m_enableWindlight=false;
+            m_enableWindlight = false;
         }
 
         private void HandleEnable(Object[] args)