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/World/Sound | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.zip opensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.gz opensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.bz2 opensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.xz |
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Sound')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index ed7bfe1..37f1f2e 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | |||
@@ -26,7 +26,6 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using Mono.Addins; | ||
30 | using Nini.Config; | 29 | using Nini.Config; |
31 | using OpenMetaverse; | 30 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
@@ -35,44 +34,26 @@ using OpenSim.Region.Framework.Scenes; | |||
35 | 34 | ||
36 | namespace OpenSim.Region.CoreModules.World.Sound | 35 | namespace OpenSim.Region.CoreModules.World.Sound |
37 | { | 36 | { |
38 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 37 | public class SoundModule : IRegionModule, ISoundModule |
39 | public class SoundModule : INonSharedRegionModule, ISoundModule | ||
40 | { | 38 | { |
41 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 40 | ||
43 | protected Scene m_scene; | 41 | protected Scene m_scene; |
44 | 42 | ||
45 | public void Initialise(IConfigSource source) | 43 | public void Initialise(Scene scene, IConfigSource source) |
46 | { | ||
47 | } | ||
48 | |||
49 | public void AddRegion(Scene scene) | ||
50 | { | 44 | { |
51 | m_scene = scene; | 45 | m_scene = scene; |
52 | 46 | ||
53 | m_scene.EventManager.OnNewClient += OnNewClient; | 47 | m_scene.EventManager.OnNewClient += OnNewClient; |
54 | 48 | ||
55 | m_scene.RegisterModuleInterface<ISoundModule>(this); | 49 | m_scene.RegisterModuleInterface<ISoundModule>(this); |
56 | } | 50 | } |
57 | |||
58 | public Type ReplaceableInterface | ||
59 | { | ||
60 | get { return null; } | ||
61 | } | ||
62 | |||
63 | public void RegionLoaded(Scene scene) | ||
64 | { | ||
65 | } | ||
66 | |||
67 | public void RemoveRegion(Scene scene) | ||
68 | { | ||
69 | scene.EventManager.OnNewClient -= OnNewClient; | ||
70 | scene.UnregisterModuleInterface<ISoundModule>(this); | ||
71 | } | ||
72 | 51 | ||
52 | public void PostInitialise() {} | ||
73 | public void Close() {} | 53 | public void Close() {} |
74 | public string Name { get { return "Sound Module"; } } | 54 | public string Name { get { return "Sound Module"; } } |
75 | 55 | public bool IsSharedModule { get { return false; } } | |
56 | |||
76 | private void OnNewClient(IClientAPI client) | 57 | private void OnNewClient(IClientAPI client) |
77 | { | 58 | { |
78 | client.OnSoundTrigger += TriggerSound; | 59 | client.OnSoundTrigger += TriggerSound; |