ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

move servicesGodAgentID to Constants.cs

Browse Source
This commit is contained in:
UbitUmarov
2020-12-25 22:48:42 +00:00
parent 696a7a4edc
commit a0d0bbacb2
7 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
/// <summary>Special UUID for actions that apply to all agents</summary>
private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb");
private static readonly UUID UUID_GRID_GOD = new UUID("6571e388-6218-4574-87db-f9379718315e");
protected Scene m_scene;
protected IDialogModule m_dialogModule;
@@ -302,7 +301,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
{
m_log.DebugFormat("[GODS]: Sending nonlocal kill for agent {0}", agentID);
transferModule.SendInstantMessage(new GridInstantMessage(
m_scene, UUID_GRID_GOD, "GRID", agentID, (byte)250, false,
m_scene, Constants.servicesGodAgentID, "GRID", agentID, (byte)250, false,
reason, UUID.Zero, true,
new Vector3(), new byte[] {0}, true),
delegate(bool success) {} );
@@ -342,7 +341,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
UUID godID = new UUID(msg.fromAgentID);
uint kickMode = (uint)msg.binaryBucket[0];
if(godID == UUID_GRID_GOD)
if(godID == Constants.servicesGodAgentID)
GridKickUser(agentID, reason);
else
KickUser(godID, agentID, kickMode, reason);