OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement nonlocal god kicks and freezes

avinationmerge
Melanie 2011-01-14 03:35:45 +01:00
parent 139e84c0b2
commit fe2d9be0cf
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
View File

@ -74,6 +74,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
m_scene.EventManager.OnNewClient += SubscribeToClientEvents; m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
m_scene.EventManager.OnClientClosed += OnClientClosed; m_scene.EventManager.OnClientClosed += OnClientClosed;
scene.EventManager.OnIncomingInstantMessage +=
OnIncomingInstantMessage;
} }
public void PostInitialise() {} public void PostInitialise() {}
@ -128,6 +130,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
uint kickFlags = userData["KickFlags"].AsUInteger(); uint kickFlags = userData["KickFlags"].AsUInteger();
string reason = userData["Reason"].AsString(); string reason = userData["Reason"].AsString();
ScenePresence god = m_scene.GetScenePresence(godID);
if (god == null || god.ControllingClient.SessionId != godSessionID)
return String.Empty;
KickUser(godID, godSessionID, agentID, kickFlags, Util.StringToBytes1024(reason)); KickUser(godID, godSessionID, agentID, kickFlags, Util.StringToBytes1024(reason));
} }
else else
@ -188,12 +194,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
if (!m_scene.Permissions.IsGod(godID)) if (!m_scene.Permissions.IsGod(godID))
return; return;
ScenePresence god = m_scene.GetScenePresence(godID);
if (god == null || god.ControllingClient.SessionId != sessionID)
return;
ScenePresence sp = m_scene.GetScenePresence(agentID); ScenePresence sp = m_scene.GetScenePresence(agentID);
if (sp == null && agentID != ALL_AGENTS)
{
IMessageTransferModule transferModule =
m_scene.RequestModuleInterface<IMessageTransferModule>();
if (transferModule != null)
{
m_log.DebugFormat("[GODS]: Sending nonlocal kill for agent {0}", agentID);
transferModule.SendInstantMessage(new GridInstantMessage(
m_scene, godID, "God", agentID, (byte)250, false,
Utils.BytesToString(reason), UUID.Zero, true,
new Vector3(), new byte[] {(byte)kickflags}),
delegate(bool success) {} );
}
return;
}
switch (kickflags) switch (kickflags)
{ {
case 0: case 0:
@ -240,5 +258,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
sp.ControllingClient.Kick(reason); sp.ControllingClient.Kick(reason);
sp.Scene.IncomingCloseAgent(sp.UUID); sp.Scene.IncomingCloseAgent(sp.UUID);
} }
private void OnIncomingInstantMessage(GridInstantMessage msg)
{
if (msg.dialog == (uint)250) // Nonlocal kick
{
UUID agentID = new UUID(msg.toAgentID);
string reason = msg.message;
UUID godID = new UUID(msg.fromAgentID);
uint kickMode = (uint)msg.binaryBucket[0];
KickUser(godID, UUID.Zero, agentID, kickMode, Util.StringToBytes1024(reason));
}
}
} }
} }