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/Avatar/Gods | |
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/Avatar/Gods')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index 3914f2e..50171a3 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||
@@ -25,9 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
30 | using Mono.Addins; | ||
31 | using Nini.Config; | 29 | using Nini.Config; |
32 | using OpenMetaverse; | 30 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
@@ -36,8 +34,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
36 | 34 | ||
37 | namespace OpenSim.Region.CoreModules.Avatar.Gods | 35 | namespace OpenSim.Region.CoreModules.Avatar.Gods |
38 | { | 36 | { |
39 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 37 | public class GodsModule : IRegionModule, IGodsModule |
40 | public class GodsModule : INonSharedRegionModule, IGodsModule | ||
41 | { | 38 | { |
42 | /// <summary>Special UUID for actions that apply to all agents</summary> | 39 | /// <summary>Special UUID for actions that apply to all agents</summary> |
43 | private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb"); | 40 | private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb"); |
@@ -45,34 +42,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
45 | protected Scene m_scene; | 42 | protected Scene m_scene; |
46 | protected IDialogModule m_dialogModule; | 43 | protected IDialogModule m_dialogModule; |
47 | 44 | ||
48 | public void Initialise(IConfigSource source) | 45 | public void Initialise(Scene scene, IConfigSource source) |
49 | { | ||
50 | |||
51 | } | ||
52 | |||
53 | public Type ReplaceableInterface | ||
54 | { | ||
55 | get { return null; } | ||
56 | } | ||
57 | |||
58 | public void AddRegion(Scene scene) | ||
59 | { | 46 | { |
60 | m_scene = scene; | 47 | m_scene = scene; |
61 | m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>(); | 48 | m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>(); |
62 | m_scene.RegisterModuleInterface<IGodsModule>(this); | 49 | m_scene.RegisterModuleInterface<IGodsModule>(this); |
63 | } | 50 | } |
64 | |||
65 | public void RegionLoaded(Scene scene) | ||
66 | { | ||
67 | } | ||
68 | |||
69 | public void RemoveRegion(Scene scene) | ||
70 | { | ||
71 | scene.UnregisterModuleInterface<IGodsModule>(this); | ||
72 | } | ||
73 | 51 | ||
52 | public void PostInitialise() {} | ||
74 | public void Close() {} | 53 | public void Close() {} |
75 | public string Name { get { return "Gods Module"; } } | 54 | public string Name { get { return "Gods Module"; } } |
55 | public bool IsSharedModule { get { return false; } } | ||
76 | 56 | ||
77 | public void RequestGodlikePowers( | 57 | public void RequestGodlikePowers( |
78 | UUID agentID, UUID sessionID, UUID token, bool godLike, IClientAPI controllingClient) | 58 | UUID agentID, UUID sessionID, UUID token, bool godLike, IClientAPI controllingClient) |