add some LSL
parent
92b7dd27a3
commit
c14209e362
|
@ -4224,6 +4224,38 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void llStartObjectAnimation(string anim)
|
||||||
|
{
|
||||||
|
m_host.AddScriptLPS(1);
|
||||||
|
|
||||||
|
// Do NOT try to parse UUID, animations cannot be triggered by ID
|
||||||
|
UUID animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation);
|
||||||
|
if (animID == UUID.Zero)
|
||||||
|
return;
|
||||||
|
m_host.AddAnimation(animID, anim);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void llStopObjectAnimation(string anim)
|
||||||
|
{
|
||||||
|
m_host.AddScriptLPS(1);
|
||||||
|
UUID animID = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, anim, AssetType.Animation);
|
||||||
|
if (animID != UUID.Zero)
|
||||||
|
m_host.RemoveAnimation(animID);
|
||||||
|
}
|
||||||
|
|
||||||
|
public LSL_List llGetObjectAnimationNames()
|
||||||
|
{
|
||||||
|
m_host.AddScriptLPS(1);
|
||||||
|
LSL_List ret = new LSL_List();
|
||||||
|
|
||||||
|
if(m_host.AnimationsNames == null || m_host.AnimationsNames.Count == 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
foreach (string name in m_host.AnimationsNames.Values)
|
||||||
|
ret.Add(new LSL_String(name));
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
public void llPointAt(LSL_Vector pos)
|
public void llPointAt(LSL_Vector pos)
|
||||||
{
|
{
|
||||||
m_host.AddScriptLPS(1);
|
m_host.AddScriptLPS(1);
|
||||||
|
|
|
@ -409,6 +409,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
|
||||||
LSL_Float llSqrt(double f);
|
LSL_Float llSqrt(double f);
|
||||||
void llStartAnimation(string anim);
|
void llStartAnimation(string anim);
|
||||||
void llStopAnimation(string anim);
|
void llStopAnimation(string anim);
|
||||||
|
void llStartObjectAnimation(string anim);
|
||||||
|
void llStopObjectAnimation(string anim);
|
||||||
|
LSL_List llGetObjectAnimationNames();
|
||||||
void llStopHover();
|
void llStopHover();
|
||||||
void llStopLookAt();
|
void llStopLookAt();
|
||||||
void llStopMoveToTarget();
|
void llStopMoveToTarget();
|
||||||
|
|
|
@ -1836,6 +1836,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
m_LSL_Functions.llStopAnimation(anim);
|
m_LSL_Functions.llStopAnimation(anim);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void llStartObjectAnimation(string anim)
|
||||||
|
{
|
||||||
|
m_LSL_Functions.llStartObjectAnimation(anim);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void llStopObjectAnimation(string anim)
|
||||||
|
{
|
||||||
|
m_LSL_Functions.llStopObjectAnimation(anim);
|
||||||
|
}
|
||||||
|
|
||||||
|
public LSL_List llGetObjectAnimationNames()
|
||||||
|
{
|
||||||
|
return m_LSL_Functions.llGetObjectAnimationNames();
|
||||||
|
}
|
||||||
|
|
||||||
public void llStopHover()
|
public void llStopHover()
|
||||||
{
|
{
|
||||||
m_LSL_Functions.llStopHover();
|
m_LSL_Functions.llStopHover();
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
41ccf83c-178f-6070-7960-1448d28dcdab
|
a0b4b514-3c14-6b98-ca98-e18a79e9792f
|
||||||
<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
|
<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
|
||||||
<key>controls</key>
|
<key>controls</key>
|
||||||
<map>
|
<map>
|
||||||
|
@ -4063,6 +4063,11 @@
|
||||||
<key>return</key><string>integer</string>
|
<key>return</key><string>integer</string>
|
||||||
<key>arguments</key><undef/>
|
<key>arguments</key><undef/>
|
||||||
</map>
|
</map>
|
||||||
|
<key>llGetObjectAnimationNames</key>
|
||||||
|
<map>
|
||||||
|
<key>return</key><string>list</string>
|
||||||
|
<key>arguments</key><undef/>
|
||||||
|
</map>
|
||||||
<key>llGetObjectDesc</key>
|
<key>llGetObjectDesc</key>
|
||||||
<map>
|
<map>
|
||||||
<key>return</key><string>string</string>
|
<key>return</key><string>string</string>
|
||||||
|
@ -5797,6 +5802,12 @@
|
||||||
<map><key>anim</key><map><key>type</key><string>string</string></map></map>
|
<map><key>anim</key><map><key>type</key><string>string</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
</map>
|
</map>
|
||||||
|
<key>llStartObjectAnimation</key>
|
||||||
|
<map>
|
||||||
|
<key>arguments</key><array>
|
||||||
|
<map><key>anim</key><map><key>type</key><string>string</string></map></map>
|
||||||
|
</array>
|
||||||
|
</map>
|
||||||
<key>llStopAnimation</key>
|
<key>llStopAnimation</key>
|
||||||
<map>
|
<map>
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
|
@ -5815,6 +5826,12 @@
|
||||||
<map>
|
<map>
|
||||||
<key>arguments</key><undef/>
|
<key>arguments</key><undef/>
|
||||||
</map>
|
</map>
|
||||||
|
<key>llStopObjectAnimation</key>
|
||||||
|
<map>
|
||||||
|
<key>arguments</key><array>
|
||||||
|
<map><key>anim</key><map><key>type</key><string>string</string></map></map>
|
||||||
|
</array>
|
||||||
|
</map>
|
||||||
<key>llStopPointAt</key>
|
<key>llStopPointAt</key>
|
||||||
<map>
|
<map>
|
||||||
<key>arguments</key><undef/>
|
<key>arguments</key><undef/>
|
||||||
|
@ -6099,35 +6116,35 @@
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>va</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>va</key><map><key>type</key><string>vector</string></map></map>
|
||||||
<map><key>vb</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>vb</key><map><key>type</key><string>vector</string></map></map>
|
||||||
</array>
|
|
||||||
</map>
|
|
||||||
<key>osApproxEquals</key>
|
|
||||||
<map>
|
|
||||||
<key>return</key><string>integer</string>
|
|
||||||
<key>arguments</key><array>
|
|
||||||
<map><key>a</key><map><key>type</key><string>float</string></map></map>
|
|
||||||
<map><key>b</key><map><key>type</key><string>float</string></map></map>
|
|
||||||
<map><key>margin</key><map><key>type</key><string>float</string></map></map>
|
<map><key>margin</key><map><key>type</key><string>float</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
</map>
|
</map>
|
||||||
<key>osApproxEquals</key>
|
<key>osApproxEquals</key>
|
||||||
<map>
|
|
||||||
<key>return</key><string>integer</string>
|
|
||||||
<key>arguments</key><array>
|
|
||||||
<map><key>a</key><map><key>type</key><string>float</string></map></map>
|
|
||||||
<map><key>b</key><map><key>type</key><string>float</string></map></map>
|
|
||||||
</array>
|
|
||||||
</map>
|
|
||||||
<key>osApproxEquals</key>
|
|
||||||
<map>
|
<map>
|
||||||
<key>return</key><string>integer</string>
|
<key>return</key><string>integer</string>
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>va</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>va</key><map><key>type</key><string>vector</string></map></map>
|
||||||
<map><key>vb</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>vb</key><map><key>type</key><string>vector</string></map></map>
|
||||||
|
</array>
|
||||||
|
</map>
|
||||||
|
<key>osApproxEquals</key>
|
||||||
|
<map>
|
||||||
|
<key>return</key><string>integer</string>
|
||||||
|
<key>arguments</key><array>
|
||||||
|
<map><key>a</key><map><key>type</key><string>float</string></map></map>
|
||||||
|
<map><key>b</key><map><key>type</key><string>float</string></map></map>
|
||||||
<map><key>margin</key><map><key>type</key><string>float</string></map></map>
|
<map><key>margin</key><map><key>type</key><string>float</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
</map>
|
</map>
|
||||||
<key>osApproxEquals</key>
|
<key>osApproxEquals</key>
|
||||||
|
<map>
|
||||||
|
<key>return</key><string>integer</string>
|
||||||
|
<key>arguments</key><array>
|
||||||
|
<map><key>a</key><map><key>type</key><string>float</string></map></map>
|
||||||
|
<map><key>b</key><map><key>type</key><string>float</string></map></map>
|
||||||
|
</array>
|
||||||
|
</map>
|
||||||
|
<key>osApproxEquals</key>
|
||||||
<map>
|
<map>
|
||||||
<key>return</key><string>integer</string>
|
<key>return</key><string>integer</string>
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
|
@ -6267,6 +6284,8 @@
|
||||||
<key>return</key><string>string</string>
|
<key>return</key><string>string</string>
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>drawList</key><map><key>type</key><string>string</string></map></map>
|
<map><key>drawList</key><map><key>type</key><string>string</string></map></map>
|
||||||
|
<map><key>startX</key><map><key>type</key><string>integer</string></map></map>
|
||||||
|
<map><key>startY</key><map><key>type</key><string>integer</string></map></map>
|
||||||
<map><key>endX</key><map><key>type</key><string>integer</string></map></map>
|
<map><key>endX</key><map><key>type</key><string>integer</string></map></map>
|
||||||
<map><key>endY</key><map><key>type</key><string>integer</string></map></map>
|
<map><key>endY</key><map><key>type</key><string>integer</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
|
@ -6276,8 +6295,6 @@
|
||||||
<key>return</key><string>string</string>
|
<key>return</key><string>string</string>
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>drawList</key><map><key>type</key><string>string</string></map></map>
|
<map><key>drawList</key><map><key>type</key><string>string</string></map></map>
|
||||||
<map><key>startX</key><map><key>type</key><string>integer</string></map></map>
|
|
||||||
<map><key>startY</key><map><key>type</key><string>integer</string></map></map>
|
|
||||||
<map><key>endX</key><map><key>type</key><string>integer</string></map></map>
|
<map><key>endX</key><map><key>type</key><string>integer</string></map></map>
|
||||||
<map><key>endY</key><map><key>type</key><string>integer</string></map></map>
|
<map><key>endY</key><map><key>type</key><string>integer</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
|
@ -6416,13 +6433,13 @@
|
||||||
<map>
|
<map>
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>avatar</key><map><key>type</key><string>string</string></map></map>
|
<map><key>avatar</key><map><key>type</key><string>string</string></map></map>
|
||||||
|
<map><key>target</key><map><key>type</key><string>string</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
</map>
|
</map>
|
||||||
<key>osForceOtherSit</key>
|
<key>osForceOtherSit</key>
|
||||||
<map>
|
<map>
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>avatar</key><map><key>type</key><string>string</string></map></map>
|
<map><key>avatar</key><map><key>type</key><string>string</string></map></map>
|
||||||
<map><key>target</key><map><key>type</key><string>string</string></map></map>
|
|
||||||
</array>
|
</array>
|
||||||
</map>
|
</map>
|
||||||
<key>osFormatString</key>
|
<key>osFormatString</key>
|
||||||
|
@ -6822,6 +6839,7 @@
|
||||||
<map><key>name</key><map><key>type</key><string>string</string></map></map>
|
<map><key>name</key><map><key>type</key><string>string</string></map></map>
|
||||||
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
||||||
<map><key>notecard</key><map><key>type</key><string>string</string></map></map>
|
<map><key>notecard</key><map><key>type</key><string>string</string></map></map>
|
||||||
|
<map><key>options</key><map><key>type</key><string>integer</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
</map>
|
</map>
|
||||||
<key>osNpcCreate</key>
|
<key>osNpcCreate</key>
|
||||||
|
@ -6832,7 +6850,6 @@
|
||||||
<map><key>name</key><map><key>type</key><string>string</string></map></map>
|
<map><key>name</key><map><key>type</key><string>string</string></map></map>
|
||||||
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
||||||
<map><key>notecard</key><map><key>type</key><string>string</string></map></map>
|
<map><key>notecard</key><map><key>type</key><string>string</string></map></map>
|
||||||
<map><key>options</key><map><key>type</key><string>integer</string></map></map>
|
|
||||||
</array>
|
</array>
|
||||||
</map>
|
</map>
|
||||||
<key>osNpcGetOwner</key>
|
<key>osNpcGetOwner</key>
|
||||||
|
@ -7415,8 +7432,6 @@
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>src</key><map><key>type</key><string>string</string></map></map>
|
<map><key>src</key><map><key>type</key><string>string</string></map></map>
|
||||||
<map><key>value</key><map><key>type</key><string>string</string></map></map>
|
<map><key>value</key><map><key>type</key><string>string</string></map></map>
|
||||||
<map><key>start</key><map><key>type</key><string>integer</string></map></map>
|
|
||||||
<map><key>count</key><map><key>type</key><string>integer</string></map></map>
|
|
||||||
<map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
|
<map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
</map>
|
</map>
|
||||||
|
@ -7426,6 +7441,8 @@
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>src</key><map><key>type</key><string>string</string></map></map>
|
<map><key>src</key><map><key>type</key><string>string</string></map></map>
|
||||||
<map><key>value</key><map><key>type</key><string>string</string></map></map>
|
<map><key>value</key><map><key>type</key><string>string</string></map></map>
|
||||||
|
<map><key>start</key><map><key>type</key><string>integer</string></map></map>
|
||||||
|
<map><key>count</key><map><key>type</key><string>integer</string></map></map>
|
||||||
<map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
|
<map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
</map>
|
</map>
|
||||||
|
@ -7520,6 +7537,8 @@
|
||||||
<map>
|
<map>
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>agent</key><map><key>type</key><string>string</string></map></map>
|
<map><key>agent</key><map><key>type</key><string>string</string></map></map>
|
||||||
|
<map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
|
||||||
|
<map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
|
||||||
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
||||||
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
|
@ -7528,8 +7547,6 @@
|
||||||
<map>
|
<map>
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>agent</key><map><key>type</key><string>string</string></map></map>
|
<map><key>agent</key><map><key>type</key><string>string</string></map></map>
|
||||||
<map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
|
|
||||||
<map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
|
|
||||||
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
||||||
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
|
@ -7547,7 +7564,8 @@
|
||||||
<key>osTeleportOwner</key>
|
<key>osTeleportOwner</key>
|
||||||
<map>
|
<map>
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>regionName</key><map><key>type</key><string>string</string></map></map>
|
<map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
|
||||||
|
<map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
|
||||||
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
||||||
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
|
@ -7555,8 +7573,7 @@
|
||||||
<key>osTeleportOwner</key>
|
<key>osTeleportOwner</key>
|
||||||
<map>
|
<map>
|
||||||
<key>arguments</key><array>
|
<key>arguments</key><array>
|
||||||
<map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
|
<map><key>regionName</key><map><key>type</key><string>string</string></map></map>
|
||||||
<map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
|
|
||||||
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
||||||
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
||||||
</array>
|
</array>
|
||||||
|
|
Loading…
Reference in New Issue