diff options
author | PixelTomsen | 2012-11-11 19:12:06 +0100 |
---|---|---|
committer | Diva Canto | 2012-11-11 11:17:40 -0800 |
commit | 37c970090401b620bf58be1d7618e3637c283cfe (patch) | |
tree | 1f2bb4a849124369413c05e36b25737c69eee1e0 /OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs | |
parent | remove entry OpenGridProtocol in OpenSimDefaults.ini - module was deleted (diff) | |
download | opensim-SC_OLD-37c970090401b620bf58be1d7618e3637c283cfe.zip opensim-SC_OLD-37c970090401b620bf58be1d7618e3637c283cfe.tar.gz opensim-SC_OLD-37c970090401b620bf58be1d7618e3637c283cfe.tar.bz2 opensim-SC_OLD-37c970090401b620bf58be1d7618e3637c283cfe.tar.xz |
moving windlight-sources to correct namespace-named folder (world); add LightShare as Interface
Signed-off-by: Diva Canto <diva@metaverseink.com>
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs (renamed from OpenSim/Region/CoreModules/LightShare/LightShareModule.cs) | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs index c9a263f..bd04ded 100644 --- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs +++ b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs | |||
@@ -27,22 +27,20 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | ||
31 | using System.Reflection; | 30 | using System.Reflection; |
32 | using OpenMetaverse; | 31 | using OpenMetaverse; |
33 | using log4net; | ||
34 | using Nini.Config; | ||
35 | using OpenSim.Data; | ||
36 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
37 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; | 33 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; |
38 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using log4net; | ||
37 | using Nini.Config; | ||
40 | using Mono.Addins; | 38 | using Mono.Addins; |
41 | 39 | ||
42 | namespace OpenSim.Region.CoreModules.World.LightShare | 40 | namespace OpenSim.Region.CoreModules.World.LightShare |
43 | { | 41 | { |
44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 42 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
45 | public class LightShareModule : INonSharedRegionModule, ICommandableModule | 43 | public class LightShareModule : INonSharedRegionModule, ILightShareModule, ICommandableModule |
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 | private readonly Commander m_commander = new Commander("windlight"); | 46 | private readonly Commander m_commander = new Commander("windlight"); |
@@ -58,22 +56,10 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
58 | 56 | ||
59 | #endregion | 57 | #endregion |
60 | 58 | ||
61 | #region IRegionModule Members | 59 | #region INonSharedRegionModule Members |
62 | |||
63 | public static bool EnableWindlight | ||
64 | { | ||
65 | get | ||
66 | { | ||
67 | return m_enableWindlight; | ||
68 | } | ||
69 | set | ||
70 | { | ||
71 | } | ||
72 | } | ||
73 | 60 | ||
74 | public void Initialise(IConfigSource config) | 61 | public void Initialise(IConfigSource config) |
75 | { | 62 | { |
76 | // ini file settings | ||
77 | try | 63 | try |
78 | { | 64 | { |
79 | m_enableWindlight = config.Configs["LightShare"].GetBoolean("enable_windlight", false); | 65 | m_enableWindlight = config.Configs["LightShare"].GetBoolean("enable_windlight", false); |
@@ -92,7 +78,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
92 | return; | 78 | return; |
93 | 79 | ||
94 | m_scene = scene; | 80 | m_scene = scene; |
95 | //m_scene.RegisterModuleInterface<IRegionModule>(this); | 81 | m_scene.RegisterModuleInterface<ILightShareModule>(this); |
96 | m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; | 82 | m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; |
97 | 83 | ||
98 | m_scene.EventManager.OnMakeRootAgent += EventManager_OnMakeRootAgent; | 84 | m_scene.EventManager.OnMakeRootAgent += EventManager_OnMakeRootAgent; |
@@ -137,6 +123,17 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
137 | 123 | ||
138 | #endregion | 124 | #endregion |
139 | 125 | ||
126 | public static bool EnableWindlight | ||
127 | { | ||
128 | get | ||
129 | { | ||
130 | return m_enableWindlight; | ||
131 | } | ||
132 | set | ||
133 | { | ||
134 | } | ||
135 | } | ||
136 | |||
140 | #region events | 137 | #region events |
141 | 138 | ||
142 | private List<byte[]> compileWindlightSettings(RegionLightShareData wl) | 139 | private List<byte[]> compileWindlightSettings(RegionLightShareData wl) |
@@ -260,7 +257,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
260 | private void HandleDisable(Object[] args) | 257 | private void HandleDisable(Object[] args) |
261 | { | 258 | { |
262 | m_log.InfoFormat("[WINDLIGHT]: Plugin now disabled"); | 259 | m_log.InfoFormat("[WINDLIGHT]: Plugin now disabled"); |
263 | m_enableWindlight=false; | 260 | m_enableWindlight = false; |
264 | } | 261 | } |
265 | 262 | ||
266 | private void HandleEnable(Object[] args) | 263 | private void HandleEnable(Object[] args) |