mirror of
https://github.com/opensim/opensim.git
synced 2026-08-06 09:16:28 +08:00
Merge branch 'master' into careminster
This commit is contained in:
@@ -493,6 +493,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||
return m_OSSL_Functions.osGetLinkPrimitiveParams(linknumber, rules);
|
||||
}
|
||||
|
||||
public LSL_Integer osIsNpc(LSL_Key npc)
|
||||
{
|
||||
return m_OSSL_Functions.osIsNpc(npc);
|
||||
}
|
||||
|
||||
public key osNpcCreate(string user, string name, vector position, key cloneFrom)
|
||||
{
|
||||
return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom);
|
||||
@@ -513,6 +518,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||
m_OSSL_Functions.osNpcLoadAppearance(npc, notecard);
|
||||
}
|
||||
|
||||
public LSL_Key osNpcGetOwner(LSL_Key npc)
|
||||
{
|
||||
return m_OSSL_Functions.osNpcGetOwner(npc);
|
||||
}
|
||||
|
||||
public vector osNpcGetPos(LSL_Key npc)
|
||||
{
|
||||
return m_OSSL_Functions.osNpcGetPos(npc);
|
||||
|
||||
Reference in New Issue
Block a user