diff options
Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
Causes an exception within HttpServer, headers have already been sent.
This reverts commit 8187fccd258bf0936d3db8663844e07a7b81e9fc.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index b2b8110..56c0d98 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -176,7 +176,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
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; |
@@ -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 | } |