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

Implement osForceCreateLink() and osForceBreakLink() 

These are identical to llCreateLink() and llBreakLink() except that they don't require script permissions.
However, osForceCreateLink() still requires that linked and linkee still have the same owner.
There's also an AutomaticLinkPermission setting in [XEngine] that could be set to true to prevent the LSL function checks.
But this doesn't allow the finer control over which users/scripts, etc. can do this that the OSSL functions provide.
0.8.0.3
Justin Clark-Casey (justincc) 2014-03-12 23:05:16 +00:00
parent beba20846f
commit 296d63e20b
4 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3769,10 +3769,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llCreateLink(string target, int parent)
{
m_host.AddScriptLPS(1);
UUID targetID;
if (!UUID.TryParse(target, out targetID))
return;
if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
&& !m_automaticLinkPermission)
@ -3781,10 +3777,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return;
}
IClientAPI client = null;
ScenePresence sp = World.GetScenePresence(m_item.PermsGranter);
if (sp != null)
client = sp.ControllingClient;
CreateLink(target, parent);
}
public void CreateLink(string target, int parent)
{
UUID targetID;
if (!UUID.TryParse(target, out targetID))
return;
SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)targetID);
@ -3819,6 +3820,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
parentPrim.HasGroupChanged = true;
parentPrim.ScheduleGroupForFullUpdate();
IClientAPI client = null;
ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
if (sp != null)
client = sp.ControllingClient;
if (client != null)
parentPrim.SendPropertiesToClient(client);
@ -3836,6 +3842,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return;
}
BreakLink(linknum);
}
public void BreakLink(int linknum)
{
if (linknum < ScriptBaseClass.LINK_THIS)
return;

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

@ -2330,6 +2330,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return retVal;
}
public void osForceCreateLink(string target, int parent)
{
CheckThreatLevel(ThreatLevel.VeryLow, "osForceCreateLink");
m_host.AddScriptLPS(1);
InitLSL();
((LSL_Api)m_LSL_Api).CreateLink(target, parent);
}
public void osForceBreakLink(int linknum)
{
CheckThreatLevel(ThreatLevel.VeryLow, "osForceBreakLink");
m_host.AddScriptLPS(1);
InitLSL();
((LSL_Api)m_LSL_Api).BreakLink(linknum);
}
public LSL_Integer osIsNpc(LSL_Key npc)
{
CheckThreatLevel(ThreatLevel.None, "osIsNpc");

13
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -293,6 +293,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules);
/// <summary>
/// Identical to llCreateLink() but does not require permission from the owner.
/// </summary>
/// <param name='target'></param>
/// <param name='parent'></param>
void osForceCreateLink(string target, int parent);
/// <summary>
/// Identical to llBreakLink() but does not require permission from the owner.
/// </summary>
/// <param name='linknum'></param>
void osForceBreakLink(int linknum);
/// <summary>
/// Check if the given key is an npc
/// </summary>

10
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -542,6 +542,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osGetLinkPrimitiveParams(linknumber, rules);
}
public void osForceCreateLink(string target, int parent)
{
m_OSSL_Functions.osForceCreateLink(target, parent);
}
public void osForceBreakLink(int linknum)
{
m_OSSL_Functions.osForceBreakLink(linknum);
}
public LSL_Integer osIsNpc(LSL_Key npc)
{
return m_OSSL_Functions.osIsNpc(npc);