diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Groups')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs index eea8e40..dbb645e 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs | |||
@@ -64,13 +64,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups | |||
64 | 64 | ||
65 | if (groupsConfig == null) | 65 | if (groupsConfig == null) |
66 | { | 66 | { |
67 | m_log.Info("[GROUPS] No configuration found. Using defaults"); | 67 | m_log.Info("[GROUPS]: No configuration found. Using defaults"); |
68 | } | 68 | } |
69 | else | 69 | else |
70 | { | 70 | { |
71 | if (!groupsConfig.GetBoolean("Enabled", false)) | 71 | if (!groupsConfig.GetBoolean("Enabled", false)) |
72 | { | 72 | { |
73 | m_log.Info("[GROUPS] Groups disabled in configuration"); | 73 | m_log.Info("[GROUPS]: Groups disabled in configuration"); |
74 | return; | 74 | return; |
75 | } | 75 | } |
76 | 76 | ||
@@ -78,8 +78,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups | |||
78 | return; | 78 | return; |
79 | } | 79 | } |
80 | 80 | ||
81 | m_log.Info("[GROUPS] Activated default groups module"); | ||
82 | |||
83 | lock (m_SceneList) | 81 | lock (m_SceneList) |
84 | { | 82 | { |
85 | if (!m_SceneList.Contains(scene)) | 83 | if (!m_SceneList.Contains(scene)) |
@@ -109,7 +107,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups | |||
109 | 107 | ||
110 | public void Close() | 108 | public void Close() |
111 | { | 109 | { |
112 | m_log.Info("[GROUP]: Shutting down group module."); | 110 | // m_log.Debug("[GROUPS]: Shutting down group module."); |
111 | |||
113 | lock (m_ClientMap) | 112 | lock (m_ClientMap) |
114 | { | 113 | { |
115 | m_ClientMap.Clear(); | 114 | m_ClientMap.Clear(); |
@@ -135,7 +134,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups | |||
135 | 134 | ||
136 | private void OnNewClient(IClientAPI client) | 135 | private void OnNewClient(IClientAPI client) |
137 | { | 136 | { |
138 | |||
139 | // Subscribe to instant messages | 137 | // Subscribe to instant messages |
140 | client.OnInstantMessage += OnInstantMessage; | 138 | client.OnInstantMessage += OnInstantMessage; |
141 | client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest; | 139 | client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest; |
@@ -148,9 +146,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups | |||
148 | } | 146 | } |
149 | } | 147 | } |
150 | 148 | ||
151 | m_log.Info("[GROUP]: Adding " + client.Name + " to " + | ||
152 | osGroup.GroupName + " "); | ||
153 | |||
154 | GroupMembershipData[] updateGroups = new GroupMembershipData[1]; | 149 | GroupMembershipData[] updateGroups = new GroupMembershipData[1]; |
155 | updateGroups[0] = osGroup; | 150 | updateGroups[0] = osGroup; |
156 | 151 | ||
@@ -211,17 +206,15 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups | |||
211 | { | 206 | { |
212 | if (m_ClientMap.ContainsKey(agentID)) | 207 | if (m_ClientMap.ContainsKey(agentID)) |
213 | { | 208 | { |
214 | IClientAPI cli = m_ClientMap[agentID]; | 209 | // IClientAPI cli = m_ClientMap[agentID]; |
215 | if (cli != null) | 210 | // if (cli != null) |
216 | { | 211 | // { |
217 | m_log.Info("[GROUP]: Removing all reference to groups "+ | 212 | // //m_log.Info("[GROUPS]: Removing all reference to groups for " + cli.Name); |
218 | "for " + cli.Name); | 213 | // } |
219 | } | 214 | // else |
220 | else | 215 | // { |
221 | { | 216 | // //m_log.Info("[GROUPS]: Removing all reference to groups for " + agentID.ToString()); |
222 | m_log.Info("[GROUP]: Removing all reference to groups "+ | 217 | // } |
223 | "for " + agentID.ToString()); | ||
224 | } | ||
225 | m_ClientMap.Remove(agentID); | 218 | m_ClientMap.Remove(agentID); |
226 | } | 219 | } |
227 | } | 220 | } |