diff --git a/OpenSim/Region/CoreModules/LightShare/EnvironmentModule.cs b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs similarity index 93% rename from OpenSim/Region/CoreModules/LightShare/EnvironmentModule.cs rename to OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs index 1526886d7a..c3cea7a58f 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 similarity index 97% rename from OpenSim/Region/CoreModules/LightShare/LightShareModule.cs rename to OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs index c9a263f8be..bd04ded019 100644 --- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs +++ b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs @@ -27,22 +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 { [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] - public class LightShareModule : INonSharedRegionModule, ICommandableModule + 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"); @@ -58,22 +56,10 @@ namespace OpenSim.Region.CoreModules.World.LightShare #endregion - #region IRegionModule Members - - public static bool EnableWindlight - { - get - { - return m_enableWindlight; - } - set - { - } - } + #region INonSharedRegionModule Members public void Initialise(IConfigSource config) { - // ini file settings try { m_enableWindlight = config.Configs["LightShare"].GetBoolean("enable_windlight", false); @@ -92,7 +78,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare return; m_scene = scene; - //m_scene.RegisterModuleInterface(this); + m_scene.RegisterModuleInterface(this); m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; m_scene.EventManager.OnMakeRootAgent += EventManager_OnMakeRootAgent; @@ -137,6 +123,17 @@ namespace OpenSim.Region.CoreModules.World.LightShare #endregion + public static bool EnableWindlight + { + get + { + return m_enableWindlight; + } + set + { + } + } + #region events private List compileWindlightSettings(RegionLightShareData wl) @@ -260,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) diff --git a/OpenSim/Region/Framework/Interfaces/ILightShareModule.cs b/OpenSim/Region/Framework/Interfaces/ILightShareModule.cs new file mode 100644 index 0000000000..b5fd24fa21 --- /dev/null +++ b/OpenSim/Region/Framework/Interfaces/ILightShareModule.cs @@ -0,0 +1,33 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +namespace OpenSim.Region.Framework.Interfaces +{ + public interface ILightShareModule + { + } +} \ No newline at end of file