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

throttle osnpcsay as llSay

Browse Source
This commit is contained in:
UbitUmarov
2021-12-31 04:12:21 +00:00
parent 4cfa0650fd
commit e3d8450692
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -1243,6 +1243,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_SayShoutCount++;
}
public void ThrottleSay(int channelID, int timeMs)
{
if (channelID == 0)
CheckSayShoutTime();
if (m_SayShoutCount >= 11)
ScriptSleep(timeMs);
}
public void llSay(int channelID, string text)
{

20
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -3308,6 +3308,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!module.CheckPermissions(npcId, m_host.OwnerID))
return;
m_LSL_Api.ThrottleSay(channel, 2000);
module.Say(npcId, World, message, channel);
}
}
@@ -3319,6 +3320,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
INPCModule module = World.RequestModuleInterface<INPCModule>();
if (module == null)
return;
IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
if (wComm == null)
return;
if (!UUID.TryParse(npc.m_string, out UUID npcId))
return;
@@ -3336,9 +3340,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Vector3 npcPOS = NPCpresence.AbsolutePosition;
string npcNAME = NPCpresence.Name;
IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
if (wComm != null)
wComm.DeliverMessageTo(TargetID, channel, npcPOS, npcNAME, npcId, msg);
m_LSL_Api.ThrottleSay(channel, 2000);
wComm.DeliverMessageTo(TargetID, channel, npcPOS, npcNAME, npcId, msg);
}
public void osNpcShout(LSL_Key npc, int channel, string message)
@@ -3353,6 +3356,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!module.CheckPermissions(npcId, m_host.OwnerID))
return;
m_LSL_Api.ThrottleSay(channel, 2000);
module.Shout(npcId, World, message, channel);
}
}
@@ -3509,7 +3513,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return;
SceneObjectPart part = null;
if (UUID.TryParse(LSL_String.ToString(object_key), out UUID objectId))
if (UUID.TryParse(object_key.m_string, out UUID objectId))
part = World.GetSceneObjectPart(objectId);
if (part == null)
@@ -3519,17 +3523,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
if (linkNum == 0 || linkNum == ScriptBaseClass.LINK_ROOT)
{ // 0 and 1 are treated as root, find the root if the current part isnt it
if (!part.IsRoot)
part = part.ParentGroup.RootPart;
part = part.ParentGroup.RootPart;
}
else
{ // Find the prim with the given link number if not found then fail silently
part = part.ParentGroup.GetLinkNumPart(linkNum);
if (part == null)
return;
}
}
if (part == null)
return;
module.Touch(npcId, part.UUID);
}
}