ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

add llLinkSetSoundQueueing and llLinkSetSoundRadius

Browse Source
This commit is contained in:
UbitUmarov
2023-02-09 10:55:44 +00:00
parent 842bb15939
commit 45beb824af
4 changed files with 108 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6640,6 +6640,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.SoundRadius = radius;
}
public void llLinkSetSoundRadius(int linknumber, double radius)
{
foreach (SceneObjectPart sop in GetLinkParts(linknumber))
sop.SoundRadius = radius;
}
public LSL_String llKey2Name(LSL_Key id)
{
if (UUID.TryParse(id, out UUID key) && key.IsNotZero())
@@ -16793,19 +16799,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// This does nothing for LSO scripts in SL
}
public void llSetSoundQueueing(int queue)
{
if (m_SoundModule != null)
m_SoundModule.SetSoundQueueing(m_host.UUID, queue == ScriptBaseClass.TRUE.value);
}
public void llLinkSetSoundQueueing(int linknumber, int queue)
{
if (m_SoundModule != null)
{
foreach (SceneObjectPart sop in GetLinkParts(linknumber))
m_SoundModule.SetSoundQueueing(sop.UUID, queue == ScriptBaseClass.TRUE.value);
}
}
#region Not Implemented
//
// Listing the unimplemented lsl functions here, please move
// them from this region as they are completed
//
public void llSetSoundQueueing(int queue)
{
if (m_SoundModule != null)
m_SoundModule.SetSoundQueueing(m_host.UUID, queue == ScriptBaseClass.TRUE.value);
}
public void llCollisionSprite(LSL_String impact_sprite)
{
// Viewer 2.0 broke this and it's likely LL has no intention

2
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
View File

@@ -491,5 +491,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void llLinkAdjustSoundVolume(LSL_Integer linknumber, LSL_Float volume);
void llLinkStopSound(LSL_Integer linknumber);
void llLinkPlaySound(LSL_Integer linknumber, string sound, double volume);
void llLinkSetSoundQueueing(int linknumber, int queue);
void llLinkSetSoundRadius(int linknumber, double radius);
}
}

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

@@ -2229,5 +2229,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{
m_LSL_Functions.llLinkPlaySound(linknumber, sound, volume);
}
public void llLinkSetSoundQueueing(int linknumber, int queue)
{
m_LSL_Functions.llLinkSetSoundQueueing(linknumber, queue);
}
public void llLinkSetSoundRadius(int linknumber, double radius)
{
m_LSL_Functions.llLinkSetSoundRadius(linknumber, radius);
}
}
}

143
bin/ScriptSyntax.xml
View File

@@ -1,4 +1,4 @@
a048660b-b334-ade9-fac7-c45ea6fe34b2
ed6c8a73-2eee-8850-88e9-5bf844e6ab3b
<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
<key>controls</key>
<map>
@@ -1661,7 +1661,7 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
</map>
<key>OS_APIVERSION</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>21</string>
<key>value</key><string>22</string>
</map>
<key>OS_ATTACH_MSG_ALL</key><map>
<key>type</key><string>integer</string>
@@ -4844,6 +4844,13 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<map><key>volume</key><map><key>type</key><string>float</string></map></map>
</array>
</map>
<key>llLinkSetSoundQueueing</key>
<map>
<key>arguments</key><array>
<map><key>linknumber</key><map><key>type</key><string>integer</string></map></map>
<map><key>queue</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>llLinkSitTarget</key>
<map>
<key>arguments</key><array>
@@ -6475,6 +6482,7 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>arguments</key><array>
<map><key>agentId</key><map><key>type</key><string>key</string></map></map>
<map><key>notecard</key><map><key>type</key><string>string</string></map></map>
<map><key>includeHuds</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osAgentSaveAppearance</key>
@@ -6483,7 +6491,6 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>arguments</key><array>
<map><key>agentId</key><map><key>type</key><string>key</string></map></map>
<map><key>notecard</key><map><key>type</key><string>string</string></map></map>
<map><key>includeHuds</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osAngleBetween</key>
@@ -6498,33 +6505,8 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<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>
<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>
</array>
</map>
<key>osApproxEquals</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
<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>
</array>
</map>
<key>osApproxEquals</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
<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>ra</key><map><key>type</key><string>rotation</string></map></map>
<map><key>rb</key><map><key>type</key><string>rotation</string></map></map>
<map><key>margin</key><map><key>type</key><string>float</string></map></map>
</array>
</map>
@@ -6540,11 +6522,36 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
<map><key>ra</key><map><key>type</key><string>rotation</string></map></map>
<map><key>rb</key><map><key>type</key><string>rotation</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>margin</key><map><key>type</key><string>float</string></map></map>
</array>
</map>
<key>osApproxEquals</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
<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>
</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>
</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>
</array>
</map>
<key>osAvatarName2Key</key>
<map>
<key>return</key><string>string</string>
@@ -6688,8 +6695,6 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>return</key><string>string</string>
<key>arguments</key><array>
<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>endY</key><map><key>type</key><string>integer</string></map></map>
</array>
@@ -6699,6 +6704,8 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>return</key><string>string</string>
<key>arguments</key><array>
<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>endY</key><map><key>type</key><string>integer</string></map></map>
</array>
@@ -6837,13 +6844,13 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<map>
<key>arguments</key><array>
<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>
</map>
<key>osForceOtherSit</key>
<map>
<key>arguments</key><array>
<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>
</map>
<key>osFormatString</key>
@@ -7227,15 +7234,15 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>osKickAvatar</key>
<map>
<key>arguments</key><array>
<map><key>agentId</key><map><key>type</key><string>key</string></map></map>
<map><key>FirstName</key><map><key>type</key><string>string</string></map></map>
<map><key>SurName</key><map><key>type</key><string>string</string></map></map>
<map><key>alert</key><map><key>type</key><string>string</string></map></map>
</array>
</map>
<key>osKickAvatar</key>
<map>
<key>arguments</key><array>
<map><key>FirstName</key><map><key>type</key><string>string</string></map></map>
<map><key>SurName</key><map><key>type</key><string>string</string></map></map>
<map><key>agentId</key><map><key>type</key><string>key</string></map></map>
<map><key>alert</key><map><key>type</key><string>string</string></map></map>
</array>
</map>
@@ -7307,14 +7314,14 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<map>
<key>arguments</key><array>
<map><key>notecardName</key><map><key>type</key><string>string</string></map></map>
<map><key>contents</key><map><key>type</key><string>list</string></map></map>
<map><key>contents</key><map><key>type</key><string>string</string></map></map>
</array>
</map>
<key>osMakeNotecard</key>
<map>
<key>arguments</key><array>
<map><key>notecardName</key><map><key>type</key><string>string</string></map></map>
<map><key>contents</key><map><key>type</key><string>string</string></map></map>
<map><key>contents</key><map><key>type</key><string>list</string></map></map>
</array>
</map>
<key>osMatchString</key>
@@ -7375,6 +7382,7 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<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>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>
</map>
<key>osNpcCreate</key>
@@ -7385,7 +7393,6 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<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>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>
</map>
<key>osNpcGetOwner</key>
@@ -7460,7 +7467,6 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>arguments</key><array>
<map><key>npc</key><map><key>type</key><string>key</string></map></map>
<map><key>notecard</key><map><key>type</key><string>string</string></map></map>
<map><key>includeHuds</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osNpcSaveAppearance</key>
@@ -7469,13 +7475,13 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>arguments</key><array>
<map><key>npc</key><map><key>type</key><string>key</string></map></map>
<map><key>notecard</key><map><key>type</key><string>string</string></map></map>
<map><key>includeHuds</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osNpcSay</key>
<map>
<key>arguments</key><array>
<map><key>npc</key><map><key>type</key><string>key</string></map></map>
<map><key>channel</key><map><key>type</key><string>integer</string></map></map>
<map><key>message</key><map><key>type</key><string>string</string></map></map>
</array>
</map>
@@ -7483,6 +7489,7 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<map>
<key>arguments</key><array>
<map><key>npc</key><map><key>type</key><string>key</string></map></map>
<map><key>channel</key><map><key>type</key><string>integer</string></map></map>
<map><key>message</key><map><key>type</key><string>string</string></map></map>
</array>
</map>
@@ -7572,7 +7579,6 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>return</key><string>key</string>
<key>arguments</key><array>
<map><key>notecard</key><map><key>type</key><string>string</string></map></map>
<map><key>includeHuds</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osOwnerSaveAppearance</key>
@@ -7580,6 +7586,7 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>return</key><string>key</string>
<key>arguments</key><array>
<map><key>notecard</key><map><key>type</key><string>string</string></map></map>
<map><key>includeHuds</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osParcelJoin</key>
@@ -7950,7 +7957,7 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>osSetProjectionParams</key>
<map>
<key>arguments</key><array>
<map><key>linknumber</key><map><key>type</key><string>integer</string></map></map>
<map><key>prim</key><map><key>type</key><string>key</string></map></map>
<map><key>projection</key><map><key>type</key><string>integer</string></map></map>
<map><key>texture</key><map><key>type</key><string>key</string></map></map>
<map><key>fov</key><map><key>type</key><string>float</string></map></map>
@@ -7961,7 +7968,7 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>osSetProjectionParams</key>
<map>
<key>arguments</key><array>
<map><key>prim</key><map><key>type</key><string>key</string></map></map>
<map><key>linknumber</key><map><key>type</key><string>integer</string></map></map>
<map><key>projection</key><map><key>type</key><string>integer</string></map></map>
<map><key>texture</key><map><key>type</key><string>key</string></map></map>
<map><key>fov</key><map><key>type</key><string>float</string></map></map>
@@ -8057,19 +8064,19 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
</map>
<key>osSlerp</key>
<map>
<key>return</key><string>rotation</string>
<key>return</key><string>vector</string>
<key>arguments</key><array>
<map><key>a</key><map><key>type</key><string>rotation</string></map></map>
<map><key>b</key><map><key>type</key><string>rotation</string></map></map>
<map><key>a</key><map><key>type</key><string>vector</string></map></map>
<map><key>b</key><map><key>type</key><string>vector</string></map></map>
<map><key>amount</key><map><key>type</key><string>float</string></map></map>
</array>
</map>
<key>osSlerp</key>
<map>
<key>return</key><string>vector</string>
<key>return</key><string>rotation</string>
<key>arguments</key><array>
<map><key>a</key><map><key>type</key><string>vector</string></map></map>
<map><key>b</key><map><key>type</key><string>vector</string></map></map>
<map><key>a</key><map><key>type</key><string>rotation</string></map></map>
<map><key>b</key><map><key>type</key><string>rotation</string></map></map>
<map><key>amount</key><map><key>type</key><string>float</string></map></map>
</array>
</map>
@@ -8094,21 +8101,10 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>arguments</key><array>
<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>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>
</array>
</map>
<key>osStringIndexOf</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
<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>ignorecase</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osStringLastIndexOf</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
@@ -8128,6 +8124,17 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osStringLastIndexOf</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
<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>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>
</array>
</map>
<key>osStringRemove</key>
<map>
<key>return</key><string>string</string>
@@ -8161,6 +8168,7 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>arguments</key><array>
<map><key>src</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>length</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osStringSubString</key>
@@ -8169,7 +8177,6 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>arguments</key><array>
<map><key>src</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>length</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osSunGetParam</key>
@@ -8190,6 +8197,7 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<map>
<key>arguments</key><array>
<map><key>agent</key><map><key>type</key><string>string</string></map></map>
<map><key>regionName</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>lookat</key><map><key>type</key><string>vector</string></map></map>
</array>
@@ -8208,7 +8216,6 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<map>
<key>arguments</key><array>
<map><key>agent</key><map><key>type</key><string>string</string></map></map>
<map><key>regionName</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>lookat</key><map><key>type</key><string>vector</string></map></map>
</array>
@@ -8226,8 +8233,7 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>osTeleportOwner</key>
<map>
<key>arguments</key><array>
<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>regionName</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>lookat</key><map><key>type</key><string>vector</string></map></map>
</array>
@@ -8235,7 +8241,8 @@ a048660b-b334-ade9-fac7-c45ea6fe34b2
<key>osTeleportOwner</key>
<map>
<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>lookat</key><map><key>type</key><string>vector</string></map></map>
</array>