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

update script syntax

master
UbitUmarov 2020-06-30 13:29:42 +01:00
parent c4f05016d7
commit 5b596bb29e
3 changed files with 185 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@ -424,8 +424,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
private void sendDetailedEstateData(IClientAPI remote_client, UUID invoice) private void sendDetailedEstateData(IClientAPI remote_client, UUID invoice)
{ {
//uint sun = 0;
UUID estateOwner; UUID estateOwner;
estateOwner = Scene.RegionInfo.EstateSettings.EstateOwner; estateOwner = Scene.RegionInfo.EstateSettings.EstateOwner;

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public partial class ScriptBaseClass public partial class ScriptBaseClass
{ {
// SCRIPTS CONSTANTS // SCRIPTS CONSTANTS
public static readonly LSLInteger OS_APIVERSION = 12; public static readonly LSLInteger OS_APIVERSION = 13;
public static readonly LSLInteger TRUE = 1; public static readonly LSLInteger TRUE = 1;
public static readonly LSLInteger FALSE = 0; public static readonly LSLInteger FALSE = 0;

238
bin/ScriptSyntax.xml
View File

@ -1,4 +1,4 @@
a0afab69-80c3-a8d5-d897-0c2c655790b4 31131f85-748a-9940-d0d5-4a1622bb4875
<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>
@ -1577,7 +1577,7 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
</map> </map>
<key>OS_APIVERSION</key><map> <key>OS_APIVERSION</key><map>
<key>type</key><string>integer</string> <key>type</key><string>integer</string>
<key>value</key><string>12</string> <key>value</key><string>13</string>
</map> </map>
<key>OS_ATTACH_MSG_ALL</key><map> <key>OS_ATTACH_MSG_ALL</key><map>
<key>type</key><string>integer</string> <key>type</key><string>integer</string>
@ -3925,6 +3925,16 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<key>return</key><string>string</string> <key>return</key><string>string</string>
<key>arguments</key><undef/> <key>arguments</key><undef/>
</map> </map>
<key>llGetDayLength</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><undef/>
</map>
<key>llGetDayOffset</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><undef/>
</map>
<key>llGetDisplayName</key> <key>llGetDisplayName</key>
<map> <map>
<key>return</key><string>string</string> <key>return</key><string>string</string>
@ -4133,6 +4143,16 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<key>return</key><string>float</string> <key>return</key><string>float</string>
<key>arguments</key><undef/> <key>arguments</key><undef/>
</map> </map>
<key>llGetMoonDirection</key>
<map>
<key>return</key><string>vector</string>
<key>arguments</key><undef/>
</map>
<key>llGetMoonRotation</key>
<map>
<key>return</key><string>rotation</string>
<key>arguments</key><undef/>
</map>
<key>llGetNextEmail</key> <key>llGetNextEmail</key>
<map> <map>
<key>arguments</key><array> <key>arguments</key><array>
@ -4318,6 +4338,16 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<key>return</key><string>vector</string> <key>return</key><string>vector</string>
<key>arguments</key><undef/> <key>arguments</key><undef/>
</map> </map>
<key>llGetRegionDayLength</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><undef/>
</map>
<key>llGetRegionDayOffset</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><undef/>
</map>
<key>llGetRegionFlags</key> <key>llGetRegionFlags</key>
<map> <map>
<key>return</key><string>integer</string> <key>return</key><string>integer</string>
@ -4328,11 +4358,31 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<key>return</key><string>float</string> <key>return</key><string>float</string>
<key>arguments</key><undef/> <key>arguments</key><undef/>
</map> </map>
<key>llGetRegionMoonDirection</key>
<map>
<key>return</key><string>vector</string>
<key>arguments</key><undef/>
</map>
<key>llGetRegionMoonRotation</key>
<map>
<key>return</key><string>rotation</string>
<key>arguments</key><undef/>
</map>
<key>llGetRegionName</key> <key>llGetRegionName</key>
<map> <map>
<key>return</key><string>string</string> <key>return</key><string>string</string>
<key>arguments</key><undef/> <key>arguments</key><undef/>
</map> </map>
<key>llGetRegionSunDirection</key>
<map>
<key>return</key><string>vector</string>
<key>arguments</key><undef/>
</map>
<key>llGetRegionSunRotation</key>
<map>
<key>return</key><string>rotation</string>
<key>arguments</key><undef/>
</map>
<key>llGetRegionTimeDilation</key> <key>llGetRegionTimeDilation</key>
<map> <map>
<key>return</key><string>float</string> <key>return</key><string>float</string>
@ -4406,6 +4456,11 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<key>return</key><string>vector</string> <key>return</key><string>vector</string>
<key>arguments</key><undef/> <key>arguments</key><undef/>
</map> </map>
<key>llGetSunRotation</key>
<map>
<key>return</key><string>rotation</string>
<key>arguments</key><undef/>
</map>
<key>llGetTexture</key> <key>llGetTexture</key>
<map> <map>
<key>return</key><string>string</string> <key>return</key><string>string</string>
@ -6197,6 +6252,15 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
</array> </array>
</map> </map>
<key>osAgentSaveAppearance</key> <key>osAgentSaveAppearance</key>
<map>
<key>return</key><string>key</string>
<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>
<map> <map>
<key>return</key><string>key</string> <key>return</key><string>key</string>
<key>arguments</key><array> <key>arguments</key><array>
@ -6216,25 +6280,8 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<map> <map>
<key>return</key><string>integer</string> <key>return</key><string>integer</string>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>a</key><map><key>type</key><string>float</string></map></map> <map><key>ra</key><map><key>type</key><string>rotation</string></map></map>
<map><key>b</key><map><key>type</key><string>float</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>
<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>
<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>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>
@ -6250,8 +6297,8 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<map> <map>
<key>return</key><string>integer</string> <key>return</key><string>integer</string>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>ra</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>rb</key><map><key>type</key><string>rotation</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> <map><key>margin</key><map><key>type</key><string>float</string></map></map>
</array> </array>
</map> </map>
@ -6263,6 +6310,23 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<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> </array>
</map> </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> <key>osAvatarName2Key</key>
<map> <map>
<key>return</key><string>string</string> <key>return</key><string>string</string>
@ -6576,6 +6640,30 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<key>return</key><string>list</string> <key>return</key><string>list</string>
<key>arguments</key><undef/> <key>arguments</key><undef/>
</map> </map>
<key>osGetApparentRegionTime</key>
<map>
<key>return</key><string>float</string>
<key>arguments</key><undef/>
</map>
<key>osGetApparentRegionTimeString</key>
<map>
<key>return</key><string>string</string>
<key>arguments</key><array>
<map><key>format24</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osGetApparentTime</key>
<map>
<key>return</key><string>float</string>
<key>arguments</key><undef/>
</map>
<key>osGetApparentTimeString</key>
<map>
<key>return</key><string>string</string>
<key>arguments</key><array>
<map><key>format24</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osGetAvatarHomeURI</key> <key>osGetAvatarHomeURI</key>
<map> <map>
<key>return</key><string>string</string> <key>return</key><string>string</string>
@ -6906,15 +6994,15 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<key>osKickAvatar</key> <key>osKickAvatar</key>
<map> <map>
<key>arguments</key><array> <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> <map><key>alert</key><map><key>type</key><string>string</string></map></map>
</array> </array>
</map> </map>
<key>osKickAvatar</key> <key>osKickAvatar</key>
<map> <map>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>FirstName</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>SurName</key><map><key>type</key><string>string</string></map></map>
<map><key>alert</key><map><key>type</key><string>string</string></map></map> <map><key>alert</key><map><key>type</key><string>string</string></map></map>
</array> </array>
</map> </map>
@ -7107,13 +7195,15 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<key>arguments</key><array> <key>arguments</key><array>
<map><key>npc</key><map><key>type</key><string>key</string></map></map> <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>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> </array>
</map> </map>
<key>osNpcSay</key> <key>osNpcSaveAppearance</key>
<map> <map>
<key>return</key><string>key</string>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>npc</key><map><key>type</key><string>key</string></map></map> <map><key>npc</key><map><key>type</key><string>key</string></map></map>
<map><key>message</key><map><key>type</key><string>string</string></map></map> <map><key>notecard</key><map><key>type</key><string>string</string></map></map>
</array> </array>
</map> </map>
<key>osNpcSay</key> <key>osNpcSay</key>
@ -7124,6 +7214,13 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<map><key>message</key><map><key>type</key><string>string</string></map></map> <map><key>message</key><map><key>type</key><string>string</string></map></map>
</array> </array>
</map> </map>
<key>osNpcSay</key>
<map>
<key>arguments</key><array>
<map><key>npc</key><map><key>type</key><string>key</string></map></map>
<map><key>message</key><map><key>type</key><string>string</string></map></map>
</array>
</map>
<key>osNpcSayTo</key> <key>osNpcSayTo</key>
<map> <map>
<key>arguments</key><array> <key>arguments</key><array>
@ -7206,6 +7303,14 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
</array> </array>
</map> </map>
<key>osOwnerSaveAppearance</key> <key>osOwnerSaveAppearance</key>
<map>
<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>
<map> <map>
<key>return</key><string>key</string> <key>return</key><string>key</string>
<key>arguments</key><array> <key>arguments</key><array>
@ -7267,13 +7372,21 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<key>osRegionNotice</key> <key>osRegionNotice</key>
<map> <map>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>agentID</key><map><key>type</key><string>key</string></map></map>
<map><key>msg</key><map><key>type</key><string>string</string></map></map> <map><key>msg</key><map><key>type</key><string>string</string></map></map>
</array> </array>
</map> </map>
<key>osRegionNotice</key> <key>osRegionNotice</key>
<map> <map>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>agentID</key><map><key>type</key><string>key</string></map></map>
<map><key>msg</key><map><key>type</key><string>string</string></map></map>
</array>
</map>
<key>osRegionRestart</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
<map><key>seconds</key><map><key>type</key><string>float</string></map></map>
<map><key>msg</key><map><key>type</key><string>string</string></map></map> <map><key>msg</key><map><key>type</key><string>string</string></map></map>
</array> </array>
</map> </map>
@ -7284,12 +7397,21 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<map><key>seconds</key><map><key>type</key><string>float</string></map></map> <map><key>seconds</key><map><key>type</key><string>float</string></map></map>
</array> </array>
</map> </map>
<key>osRegionRestart</key> <key>osReplaceAgentEnvironment</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>seconds</key><map><key>type</key><string>float</string></map></map> <map><key>agentkey</key><map><key>type</key><string>key</string></map></map>
<map><key>msg</key><map><key>type</key><string>string</string></map></map> <map><key>transition</key><map><key>type</key><string>integer</string></map></map>
<map><key>daycycle</key><map><key>type</key><string>string</string></map></map>
</array>
</map>
<key>osReplaceParcelEnvironment</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
<map><key>transition</key><map><key>type</key><string>integer</string></map></map>
<map><key>daycycle</key><map><key>type</key><string>string</string></map></map>
</array> </array>
</map> </map>
<key>osReplaceString</key> <key>osReplaceString</key>
@ -7323,6 +7445,14 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<map><key>AllLinkset</key><map><key>type</key><string>integer</string></map></map> <map><key>AllLinkset</key><map><key>type</key><string>integer</string></map></map>
</array> </array>
</map> </map>
<key>osResetEnvironment</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
<map><key>parcelOrRegion</key><map><key>type</key><string>integer</string></map></map>
<map><key>transition</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osRound</key> <key>osRound</key>
<map> <map>
<key>return</key><string>float</string> <key>return</key><string>float</string>
@ -7677,21 +7807,12 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<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>
<key>osStringIndexOf</key> <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>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>osStringLastIndexOf</key>
<map> <map>
<key>return</key><string>integer</string> <key>return</key><string>integer</string>
<key>arguments</key><array> <key>arguments</key><array>
@ -7711,6 +7832,15 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<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>
<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>ignorecase</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osStringRemove</key> <key>osStringRemove</key>
<map> <map>
<key>return</key><string>string</string> <key>return</key><string>string</string>
@ -7744,6 +7874,7 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<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>start</key><map><key>type</key><string>integer</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> </array>
</map> </map>
<key>osStringSubString</key> <key>osStringSubString</key>
@ -7752,7 +7883,6 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<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>start</key><map><key>type</key><string>integer</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> </array>
</map> </map>
<key>osSunGetParam</key> <key>osSunGetParam</key>
@ -7770,6 +7900,15 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
</array> </array>
</map> </map>
<key>osTeleportAgent</key> <key>osTeleportAgent</key>
<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>
</map>
<key>osTeleportAgent</key>
<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>
@ -7787,15 +7926,6 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<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>
</map> </map>
<key>osTeleportAgent</key>
<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>
</map>
<key>osTeleportObject</key> <key>osTeleportObject</key>
<map> <map>
<key>return</key><string>integer</string> <key>return</key><string>integer</string>
@ -7809,6 +7939,7 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<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>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>
@ -7825,7 +7956,6 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4
<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>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>