mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 00:46:02 +08:00
Merge branch 'opensim:master' into master
This commit is contained in:
@@ -5541,7 +5541,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||
return (item == null) ? LSL_String.Empty : item.Description;
|
||||
}
|
||||
|
||||
public LSL_Key osGetLinkInventoryKey(LSL_Integer linkNumber, LSL_String name)
|
||||
public LSL_Key osGetLinkInventoryItemKey(LSL_Integer linkNumber, LSL_String name)
|
||||
{
|
||||
SceneObjectPart part = GetSingleLinkPart(linkNumber);
|
||||
if(part == null)
|
||||
@@ -5561,7 +5561,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||
return LSL_String.NullKey;
|
||||
}
|
||||
|
||||
public LSL_List osGetInventoryKeys(LSL_Integer type)
|
||||
public LSL_List osGetInventoryItemKeys(LSL_Integer type)
|
||||
{
|
||||
LSL_List ret = new();
|
||||
|
||||
@@ -5579,7 +5579,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||
return ret;
|
||||
}
|
||||
|
||||
public LSL_List osGetLinkInventoryKeys(LSL_Integer linkNumber, LSL_Integer type)
|
||||
public LSL_List osGetLinkInventoryItemKeys(LSL_Integer linkNumber, LSL_Integer type)
|
||||
{
|
||||
LSL_List ret = new();
|
||||
|
||||
@@ -5899,6 +5899,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||
return 0;
|
||||
}
|
||||
|
||||
public LSL_Vector osGetSitTargetPos()
|
||||
{
|
||||
return m_host.SitTargetPosition;
|
||||
}
|
||||
|
||||
public LSL_Rotation osGetSitTargetRot()
|
||||
{
|
||||
return m_host.SitTargetOrientation;
|
||||
}
|
||||
|
||||
public void osSetSitActiveRange(LSL_Float v)
|
||||
{
|
||||
float fv = (float)v.value;
|
||||
|
||||
Reference in New Issue
Block a user