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

add a bit more things to ScriptSyntax, change a few more incoerent lsl types in function arguments

0.9.1.0-post-fixes
UbitUmarov 2018-11-10 21:00:04 +00:00
parent 90db067d2a
commit 9185d397df
5 changed files with 75 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected int m_sleepMsOnSetDamage = 5000;
protected int m_sleepMsOnTextBox = 1000;
protected int m_sleepMsOnAdjustSoundVolume = 100;
protected int m_sleepMsOnEjectFromLand = 5000;
protected int m_sleepMsOnEjectFromLand = 1000;
protected int m_sleepMsOnAddToLandPassList = 100;
protected int m_sleepMsOnDialog = 1000;
protected int m_sleepMsOnRemoteLoadScript = 3000;
@ -4454,7 +4454,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
public void llCreateLink(string target, int parent)
public void llCreateLink(LSL_String target, LSL_Integer parent)
{
m_host.AddScriptLPS(1);
@ -6923,7 +6923,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
public void llEjectFromLand(string pest)
public void llEjectFromLand(LSL_Key pest)
{
m_host.AddScriptLPS(1);
UUID agentID = new UUID();
@ -7955,7 +7955,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
public void llAddToLandPassList(string avatar, double hours)
public void llAddToLandPassList(LSL_Key avatar, double hours)
{
m_host.AddScriptLPS(1);
UUID key;
@ -8087,7 +8087,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
public void llDialog(string avatar, string message, LSL_List buttons, int chat_channel)
public void llDialog(LSL_Key avatar, LSL_String message, LSL_List buttons, int chat_channel)
{
IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
@ -13534,7 +13534,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ScriptSleep(m_sleepMsOnMapDestination);
}
public void llAddToLandBanList(string avatar, double hours)
public void llAddToLandBanList(LSL_Key avatar, double hours)
{
m_host.AddScriptLPS(1);
UUID key;

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

@ -41,10 +41,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
{
void state(string newState);
LSL_Integer llAbs(int i);
LSL_Integer llAbs(int val);
LSL_Float llAcos(double val);
void llAddToLandBanList(string avatar, double hours);
void llAddToLandPassList(string avatar, double hours);
//ApiDesc Sleep 0.1
void llAddToLandBanList(LSL_Key avatarId, double hours);
//ApiDesc Sleep 0.1
void llAddToLandPassList(LSL_Key avatarId, double hours);
//ApiDesc Sleep 0.1
void llAdjustSoundVolume(double volume);
void llAllowInventoryDrop(int add);
LSL_Float llAngleBetween(LSL_Rotation a, LSL_Rotation b);
@ -66,14 +69,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Integer llCeil(double f);
void llClearCameraParams();
LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face);
//ApiDesc Sleep 0.1
LSL_Integer llClearPrimMedia(LSL_Integer face);
//ApiDesc Sleep 1.0
void llCloseRemoteDataChannel(string channel);
LSL_Float llCloud(LSL_Vector offset);
void llCollisionFilter(string name, string id, int accept);
void llCollisionSound(string impact_sound, double impact_volume);
//ApiDesc Not Supported - does nothing
void llCollisionSprite(string impact_sprite);
LSL_Float llCos(double f);
void llCreateLink(string target, int parent);
//ApiDesc Sleep 1.0
void llCreateLink(LSL_String targetId, LSL_Integer parent);
LSL_List llCSV2List(string src);
LSL_List llDeleteSubList(LSL_List src, int start, int end);
LSL_String llDeleteSubString(string src, int start, int end);
@ -94,11 +101,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Vector llDetectedTouchST(int index);
LSL_Vector llDetectedTouchUV(int index);
LSL_Vector llDetectedVel(int number);
void llDialog(string avatar, string message, LSL_List buttons, int chat_channel);
void llDialog(LSL_Key avatarId, LSL_String message, LSL_List buttons, int chat_channel);
void llDie();
LSL_String llDumpList2String(LSL_List src, string seperator);
LSL_Integer llEdgeOfWorld(LSL_Vector pos, LSL_Vector dir);
void llEjectFromLand(string pest);
//ApiDesc Sleep 1.0
void llEjectFromLand(LSL_Key avatarId);
void llEmail(string address, string subject, string message);
LSL_String llEscapeURL(string url);
LSL_Rotation llEuler2Rot(LSL_Vector v);

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

@ -377,7 +377,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int CHANGED_REGION_RESTART = 1024;
public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
public const int CHANGED_MEDIA = 2048;
//ApiDesc opensim specific
public const int CHANGED_ANIMATION = 16384;
//ApiDesc opensim specific
public const int CHANGED_POSITION = 32768;
public const int TYPE_INVALID = 0;
@ -430,6 +432,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int PRIM_FLEXIBLE = 21;
public const int PRIM_TEXGEN = 22;
public const int PRIM_POINT_LIGHT = 23; // Huh?
//ApiDesc not supported
public const int PRIM_CAST_SHADOWS = 24; // Not implemented, here for completeness sake
public const int PRIM_GLOW = 25;
public const int PRIM_TEXT = 26;
@ -445,7 +448,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int PRIM_SPECULAR = 36;
public const int PRIM_NORMAL = 37;
public const int PRIM_ALPHA_MODE = 38;
//ApiDesc not supported
public const int PRIM_ALLOW_UNSIT = 39; // experiences related. unsupported
//ApiDesc not supported
public const int PRIM_SCRIPTED_SIT_ONLY = 40; // experiences related. unsupported
public const int PRIM_SIT_TARGET = 41;
@ -659,20 +664,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int OBJECT_ATTACHED_SLOTS_AVAILABLE = 35;
// Pathfinding types
//ApiDesc not supported
public const int OPT_OTHER = -1;
//ApiDesc not supported
public const int OPT_LEGACY_LINKSET = 0;
//ApiDesc not supported
public const int OPT_AVATAR = 1;
//ApiDesc not supported
public const int OPT_CHARACTER = 2;
//ApiDesc not supported
public const int OPT_WALKABLE = 3;
//ApiDesc not supported
public const int OPT_STATIC_OBSTACLE = 4;
//ApiDesc not supported
public const int OPT_MATERIAL_VOLUME = 5;
//ApiDesc not supported
public const int OPT_EXCLUSION_VOLUME = 6;
// for llGetAgentList
public const int AGENT_LIST_PARCEL = 1;
public const int AGENT_LIST_PARCEL = 0x1;
public const int AGENT_LIST_PARCEL_OWNER = 2;
public const int AGENT_LIST_REGION = 4;
public const int AGENT_LIST_EXCLUDENPC = 0x4000000; // our flag, not SL and it is a bit mask
public const int AGENT_LIST_EXCLUDENPC = 0x4000000;
// Can not be public const?
public static readonly vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0);
@ -875,11 +888,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
//ApiDesc osTeleportObject no flags
public const int OSTPOBJ_NONE = 0x0;
//ApiDesc osTeleportObject flag stop at destination
//ApiDesc osTeleportObject flag: stop at destination
public const int OSTPOBJ_STOPATTARGET = 0x1;
//ApiDesc osTeleportObject flag stop at jump point if tp fails
//ApiDesc osTeleportObject flag: stop at jump point if tp fails
public const int OSTPOBJ_STOPONFAIL = 0x2;
//ApiDesc osTeleportObject flag the rotation is the final rotation, otherwise is a added rotation
//ApiDesc osTeleportObject flag: the rotation is the final rotation, otherwise is a added rotation
public const int OSTPOBJ_SETROT = 0x4;
// Constants for Windlight

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

@ -210,7 +210,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_LSL_Functions.llCos(f);
}
public void llCreateLink(string target, int parent)
public void llCreateLink(LSL_String target, LSL_Integer parent)
{
m_LSL_Functions.llCreateLink(target, parent);
}
@ -315,7 +315,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_LSL_Functions.llDetectedVel(number);
}
public void llDialog(string avatar, string message, LSL_List buttons, int chat_channel)
public void llDialog(LSL_Key avatar, LSL_String message, LSL_List buttons, int chat_channel)
{
m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel);
}
@ -336,7 +336,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_LSL_Functions.llEdgeOfWorld(pos, dir);
}
public void llEjectFromLand(string pest)
public void llEjectFromLand(LSL_Key pest)
{
m_LSL_Functions.llEjectFromLand(pest);
}

47
bin/ScriptSyntax.xml
View File

@ -1,4 +1,4 @@
a6ccf55f-ded5-9093-571c-478cadca66de
21c53711-f48d-a201-a7f0-8cb35768e7e2
<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
<key>controls</key>
<map>
@ -67,7 +67,7 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>rotation</key>
<map>
<key>tooltip</key>
<string>The rotation as quaternion &lt;x, y, z, s&gt;</string>
<string>A rotation as quaternion &lt;x, y, z, s&gt;</string>
</map>
<key>string</key>
<map>
@ -77,7 +77,7 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>vector</key>
<map>
<key>tooltip</key>
<string>A vector &lt;x, y, z, s&gt;</string>
<string>A vector &lt;x, y, z&gt;</string>
</map>
</map>
<key>events</key>
@ -370,7 +370,7 @@ a6ccf55f-ded5-9093-571c-478cadca66de
</map>
<key>AGENT_LIST_PARCEL</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>1</string>
<key>value</key><string>0x1</string>
</map>
<key>AGENT_LIST_PARCEL_OWNER</key><map>
<key>type</key><string>integer</string>
@ -744,6 +744,7 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>CHANGED_ANIMATION</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>16384</string>
<key>tooltip</key><string>opensim specific</string>
</map>
<key>CHANGED_COLOR</key><map>
<key>type</key><string>integer</string>
@ -768,6 +769,7 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>CHANGED_POSITION</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>32768</string>
<key>tooltip</key><string>opensim specific</string>
</map>
<key>CHANGED_REGION</key><map>
<key>type</key><string>integer</string>
@ -1472,34 +1474,42 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>OPT_AVATAR</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>1</string>
<key>tooltip</key><string>not supported</string>
</map>
<key>OPT_CHARACTER</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>2</string>
<key>tooltip</key><string>not supported</string>
</map>
<key>OPT_EXCLUSION_VOLUME</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>6</string>
<key>tooltip</key><string>not supported</string>
</map>
<key>OPT_LEGACY_LINKSET</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>0</string>
<key>tooltip</key><string>not supported</string>
</map>
<key>OPT_MATERIAL_VOLUME</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>5</string>
<key>tooltip</key><string>not supported</string>
</map>
<key>OPT_OTHER</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>-1</string>
<key>tooltip</key><string>not supported</string>
</map>
<key>OPT_STATIC_OBSTACLE</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>4</string>
<key>tooltip</key><string>not supported</string>
</map>
<key>OPT_WALKABLE</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>3</string>
<key>tooltip</key><string>not supported</string>
</map>
<key>OS_ATTACH_MSG_ALL</key><map>
<key>type</key><string>integer</string>
@ -1569,17 +1579,17 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>OSTPOBJ_SETROT</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>0x4</string>
<key>tooltip</key><string>osTeleportObject flag the rotation is the final rotation, otherwise is a added rotation</string>
<key>tooltip</key><string>osTeleportObject flag: the rotation is the final rotation, otherwise is a added rotation</string>
</map>
<key>OSTPOBJ_STOPATTARGET</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>0x1</string>
<key>tooltip</key><string>osTeleportObject flag stop at destination</string>
<key>tooltip</key><string>osTeleportObject flag: stop at destination</string>
</map>
<key>OSTPOBJ_STOPONFAIL</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>0x2</string>
<key>tooltip</key><string>osTeleportObject flag stop at jump point if tp fails</string>
<key>tooltip</key><string>osTeleportObject flag: stop at jump point if tp fails</string>
</map>
<key>PARCEL_COUNT_GROUP</key><map>
<key>type</key><string>integer</string>
@ -1860,6 +1870,7 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>PRIM_ALLOW_UNSIT</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>39</string>
<key>tooltip</key><string>not supported</string>
</map>
<key>PRIM_ALPHA_MODE</key><map>
<key>type</key><string>integer</string>
@ -1960,6 +1971,7 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>PRIM_CAST_SHADOWS</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>24</string>
<key>tooltip</key><string>not supported</string>
</map>
<key>PRIM_COLOR</key><map>
<key>type</key><string>integer</string>
@ -2184,6 +2196,7 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>PRIM_SCRIPTED_SIT_ONLY</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>40</string>
<key>tooltip</key><string>not supported</string>
</map>
<key>PRIM_SCULPT_FLAG_INVERT</key><map>
<key>type</key><string>integer</string>
@ -3235,7 +3248,7 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
<map><key>i</key><map><key>type</key><string>integer</string></map></map>
<map><key>val</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>llAcos</key>
@ -3248,22 +3261,25 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>llAddToLandBanList</key>
<map>
<key>arguments</key><array>
<map><key>avatar</key><map><key>type</key><string>string</string></map></map>
<map><key>avatarId</key><map><key>type</key><string>key</string></map></map>
<map><key>hours</key><map><key>type</key><string>float</string></map></map>
</array>
<key>tooltip</key><string>Sleep 0.1</string>
</map>
<key>llAddToLandPassList</key>
<map>
<key>arguments</key><array>
<map><key>avatar</key><map><key>type</key><string>string</string></map></map>
<map><key>avatarId</key><map><key>type</key><string>key</string></map></map>
<map><key>hours</key><map><key>type</key><string>float</string></map></map>
</array>
<key>tooltip</key><string>Sleep 0.1</string>
</map>
<key>llAdjustSoundVolume</key>
<map>
<key>arguments</key><array>
<map><key>volume</key><map><key>type</key><string>float</string></map></map>
</array>
<key>tooltip</key><string>Sleep 0.1</string>
</map>
<key>llAllowInventoryDrop</key>
<map>
@ -3407,12 +3423,14 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>arguments</key><array>
<map><key>face</key><map><key>type</key><string>integer</string></map></map>
</array>
<key>tooltip</key><string>Sleep 0.1</string>
</map>
<key>llCloseRemoteDataChannel</key>
<map>
<key>arguments</key><array>
<map><key>channel</key><map><key>type</key><string>string</string></map></map>
</array>
<key>tooltip</key><string>Sleep 1.0</string>
</map>
<key>llCloud</key>
<map>
@ -3441,6 +3459,7 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>arguments</key><array>
<map><key>impact_sprite</key><map><key>type</key><string>string</string></map></map>
</array>
<key>tooltip</key><string>Not Supported - does nothing</string>
</map>
<key>llCos</key>
<map>
@ -3452,9 +3471,10 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>llCreateLink</key>
<map>
<key>arguments</key><array>
<map><key>target</key><map><key>type</key><string>string</string></map></map>
<map><key>targetId</key><map><key>type</key><string>string</string></map></map>
<map><key>parent</key><map><key>type</key><string>integer</string></map></map>
</array>
<key>tooltip</key><string>Sleep 1.0</string>
</map>
<key>llCSV2List</key>
<map>
@ -3600,7 +3620,7 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>llDialog</key>
<map>
<key>arguments</key><array>
<map><key>avatar</key><map><key>type</key><string>string</string></map></map>
<map><key>avatarId</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>buttons</key><map><key>type</key><string>list</string></map></map>
<map><key>chat_channel</key><map><key>type</key><string>integer</string></map></map>
@ -3629,8 +3649,9 @@ a6ccf55f-ded5-9093-571c-478cadca66de
<key>llEjectFromLand</key>
<map>
<key>arguments</key><array>
<map><key>pest</key><map><key>type</key><string>string</string></map></map>
<map><key>avatarId</key><map><key>type</key><string>key</string></map></map>
</array>
<key>tooltip</key><string>Sleep 1.0</string>
</map>
<key>llEmail</key>
<map>