aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Groups
diff options
context:
space:
mode:
authorMelanie2010-01-29 07:20:13 +0000
committerMelanie2010-01-29 07:21:06 +0000
commita87a247f0548d39a8c39b1d28123d7da8db44598 (patch)
tree7f9f77c38a224bc6d4bea7ccced1d4710c8a91b1 /OpenSim/Region/CoreModules/Avatar/Groups
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-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/Avatar/Groups')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs35
1 files changed, 8 insertions, 27 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index 7ff8d30..31363e5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -25,11 +25,9 @@
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
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Reflection; 29using System.Reflection;
31using log4net; 30using log4net;
32using Mono.Addins;
33using Nini.Config; 31using Nini.Config;
34using OpenMetaverse; 32using OpenMetaverse;
35using OpenSim.Framework; 33using OpenSim.Framework;
@@ -38,8 +36,7 @@ using OpenSim.Region.Framework.Scenes;
38 36
39namespace OpenSim.Region.CoreModules.Avatar.Groups 37namespace OpenSim.Region.CoreModules.Avatar.Groups
40{ 38{
41 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] 39 public class GroupsModule : IRegionModule
42 public class GroupsModule : ISharedRegionModule
43 { 40 {
44 private static readonly ILog m_log = 41 private static readonly ILog m_log =
45 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -58,9 +55,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
58 private static GroupMembershipData osGroup = 55 private static GroupMembershipData osGroup =
59 new GroupMembershipData(); 56 new GroupMembershipData();
60 57
61 #region ISharedRegionModule Members 58 #region IRegionModule Members
62 59
63 public void Initialise(IConfigSource config) 60 public void Initialise(Scene scene, IConfigSource config)
64 { 61 {
65 IConfig groupsConfig = config.Configs["Groups"]; 62 IConfig groupsConfig = config.Configs["Groups"];
66 63
@@ -79,15 +76,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
79 if (groupsConfig.GetString("Module", "Default") != "Default") 76 if (groupsConfig.GetString("Module", "Default") != "Default")
80 return; 77 return;
81 } 78 }
82 }
83
84 public Type ReplaceableInterface
85 {
86 get { return null; }
87 }
88 79
89 public void AddRegion(Scene scene)
90 {
91 lock (m_SceneList) 80 lock (m_SceneList)
92 { 81 {
93 if (!m_SceneList.Contains(scene)) 82 if (!m_SceneList.Contains(scene))
@@ -110,19 +99,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
110 scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage; 99 scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
111 } 100 }
112 101
113 public void RegionLoaded(Scene scene)
114 {
115 }
116
117 public void RemoveRegion(Scene scene)
118 {
119 if (m_SceneList.Contains(scene))
120 m_SceneList.Remove(scene);
121 scene.EventManager.OnNewClient -= OnNewClient;
122 scene.EventManager.OnClientClosed -= OnClientClosed;
123 scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
124 }
125
126 public void PostInitialise() 102 public void PostInitialise()
127 { 103 {
128 } 104 }
@@ -147,6 +123,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
147 get { return "GroupsModule"; } 123 get { return "GroupsModule"; }
148 } 124 }
149 125
126 public bool IsSharedModule
127 {
128 get { return true; }
129 }
130
150 #endregion 131 #endregion
151 132
152 private void OnNewClient(IClientAPI client) 133 private void OnNewClient(IClientAPI client)