ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-14 18:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

several changes to llIsFriend and related methods

Browse Source
This commit is contained in:
UbitUmarov
2024-02-16 20:14:06 +00:00
parent 089037c749
commit cf27093ee9
7 changed files with 118 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18513,7 +18513,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (string.IsNullOrEmpty(pattern.m_string))
return src;
Regex rx = new(pattern, RegexOptions, new TimeSpan(500000)); // 50ms)
Regex rx = new(pattern, RegexOptions, TimeSpan.FromMilliseconds(10));
if (replacement == null)
return rx.Replace(src.m_string, string.Empty, count);
@@ -18723,18 +18723,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (parentsog.OwnerID.Equals(parentsog.GroupID))
return llSameGroup(agent_id);
if (!UUID.TryParse(agent_id, out UUID agent) || agent.IsZero())
return 0;
IFriendsModule fm = World.RequestModuleInterface<IFriendsModule>();
if(fm is null)
return 0;
if (World.GetScenePresence(parentsog.OwnerID) is null)
return 0;
if (!UUID.TryParse(agent_id, out UUID agent))
return 0;
if (World.GetScenePresence(agent) is null)
return 0;
if (World.TryGetSceneRootPresence(agent, out _))
return fm.IsFriend(agent, parentsog.OwnerID) ? 1 : 0;
return fm.IsFriendOnline(parentsog.OwnerID, agent) ? 1 : 0;
if (World.TryGetSceneRootPresence(parentsog.OwnerID, out _))
return fm.IsFriend(parentsog.OwnerID, agent) ? 1 : 0;
return 0;
}
}

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
View File

@@ -2778,7 +2778,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{
return m_LSL_Functions.llLinksetDataListKeys(start, count);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public LSL_List llLinksetDataFindKeys(LSL_String pattern, LSL_Integer start, LSL_Integer count)
{