diff options
Patch from mcortez. This appears to be a huge change to the groups module
and I can't say if this is beneficial or destructive due to the way it
was delivered (zipfile). Pushing this on faith alone.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 6b942cb..5328d7a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -175,14 +175,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
175 | } | 175 | } |
176 | 176 | ||
177 | scene.EventManager.OnNewClient += OnNewClient; | 177 | scene.EventManager.OnNewClient += OnNewClient; |
178 | scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage; | 178 | scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage; |
179 | |||
180 | // The InstantMessageModule itself doesn't do this, | 179 | // The InstantMessageModule itself doesn't do this, |
181 | // so lets see if things explode if we don't do it | 180 | // so lets see if things explode if we don't do it |
182 | // scene.EventManager.OnClientClosed += OnClientClosed; | 181 | // scene.EventManager.OnClientClosed += OnClientClosed; |
183 | 182 | ||
184 | } | 183 | } |
185 | 184 | ||
186 | public void RemoveRegion(Scene scene) | 185 | public void RemoveRegion(Scene scene) |
187 | { | 186 | { |
188 | if (!m_groupsEnabled) | 187 | if (!m_groupsEnabled) |
@@ -510,7 +509,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
510 | IClientAPI ejectee = GetActiveClient(ejecteeID); | 509 | IClientAPI ejectee = GetActiveClient(ejecteeID); |
511 | if (ejectee != null) | 510 | if (ejectee != null) |
512 | { | 511 | { |
513 | UUID groupID = new UUID(im.fromAgentID); | 512 | UUID groupID = new UUID(im.imSessionID); |
514 | ejectee.SendAgentDropGroup(groupID); | 513 | ejectee.SendAgentDropGroup(groupID); |
515 | } | 514 | } |
516 | } | 515 | } |