diff options
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs index c306f94..8ce5092 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs | |||
@@ -25,10 +25,8 @@ | |||
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.Reflection; | 28 | using System.Reflection; |
30 | using log4net; | 29 | using log4net; |
31 | using Mono.Addins; | ||
32 | using Nini.Config; | 30 | using Nini.Config; |
33 | using OpenMetaverse; | 31 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
@@ -39,41 +37,23 @@ using OpenSim.Services.Interfaces; | |||
39 | 37 | ||
40 | namespace OpenSim.Region.CoreModules.Avatar.Gestures | 38 | namespace OpenSim.Region.CoreModules.Avatar.Gestures |
41 | { | 39 | { |
42 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 40 | public class GesturesModule : IRegionModule |
43 | public class GesturesModule : INonSharedRegionModule | ||
44 | { | 41 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 43 | ||
47 | protected Scene m_scene; | 44 | protected Scene m_scene; |
48 | 45 | ||
49 | public void Initialise(IConfigSource source) | 46 | public void Initialise(Scene scene, IConfigSource source) |
50 | { | ||
51 | } | ||
52 | |||
53 | public Type ReplaceableInterface | ||
54 | { | ||
55 | get { return null; } | ||
56 | } | ||
57 | |||
58 | public void AddRegion(Scene scene) | ||
59 | { | 47 | { |
60 | m_scene = scene; | 48 | m_scene = scene; |
49 | |||
61 | m_scene.EventManager.OnNewClient += OnNewClient; | 50 | m_scene.EventManager.OnNewClient += OnNewClient; |
62 | } | 51 | } |
63 | |||
64 | public void RegionLoaded(Scene scene) | ||
65 | { | ||
66 | } | ||
67 | |||
68 | public void RemoveRegion(Scene scene) | ||
69 | { | ||
70 | if(m_scene == scene) | ||
71 | m_scene = null; | ||
72 | scene.EventManager.OnNewClient -= OnNewClient; | ||
73 | } | ||
74 | 52 | ||
53 | public void PostInitialise() {} | ||
75 | public void Close() {} | 54 | public void Close() {} |
76 | public string Name { get { return "Gestures Module"; } } | 55 | public string Name { get { return "Gestures Module"; } } |
56 | public bool IsSharedModule { get { return false; } } | ||
77 | 57 | ||
78 | private void OnNewClient(IClientAPI client) | 58 | private void OnNewClient(IClientAPI client) |
79 | { | 59 | { |