diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 113 |
1 files changed, 93 insertions, 20 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 35aaf01..c39248b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Diagnostics; //for [DebuggerNonUserCode] | ||
29 | using System.Runtime.Remoting.Lifetime; | 30 | using System.Runtime.Remoting.Lifetime; |
30 | using System.Threading; | 31 | using System.Threading; |
31 | using System.Reflection; | 32 | using System.Reflection; |
@@ -314,6 +315,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
314 | m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); | 315 | m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); |
315 | } | 316 | } |
316 | 317 | ||
318 | [DebuggerNonUserCode] | ||
317 | public void llDie() | 319 | public void llDie() |
318 | { | 320 | { |
319 | m_LSL_Functions.llDie(); | 321 | m_LSL_Functions.llDie(); |
@@ -424,6 +426,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
424 | return m_LSL_Functions.llGetAttached(); | 426 | return m_LSL_Functions.llGetAttached(); |
425 | } | 427 | } |
426 | 428 | ||
429 | public LSL_List llGetAttachedList(string id) | ||
430 | { | ||
431 | return m_LSL_Functions.llGetAttachedList(id); | ||
432 | } | ||
433 | |||
427 | public LSL_List llGetBoundingBox(string obj) | 434 | public LSL_List llGetBoundingBox(string obj) |
428 | { | 435 | { |
429 | return m_LSL_Functions.llGetBoundingBox(obj); | 436 | return m_LSL_Functions.llGetBoundingBox(obj); |
@@ -479,6 +486,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
479 | return m_LSL_Functions.llGetFreeMemory(); | 486 | return m_LSL_Functions.llGetFreeMemory(); |
480 | } | 487 | } |
481 | 488 | ||
489 | public LSL_Integer llGetUsedMemory() | ||
490 | { | ||
491 | return m_LSL_Functions.llGetUsedMemory(); | ||
492 | } | ||
493 | |||
482 | public LSL_Integer llGetFreeURLs() | 494 | public LSL_Integer llGetFreeURLs() |
483 | { | 495 | { |
484 | return m_LSL_Functions.llGetFreeURLs(); | 496 | return m_LSL_Functions.llGetFreeURLs(); |
@@ -559,11 +571,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
559 | return m_LSL_Functions.llGetLinkNumberOfSides(link); | 571 | return m_LSL_Functions.llGetLinkNumberOfSides(link); |
560 | } | 572 | } |
561 | 573 | ||
562 | public void llSetKeyframedMotion(LSL_List frames, LSL_List options) | ||
563 | { | ||
564 | m_LSL_Functions.llSetKeyframedMotion(frames, options); | ||
565 | } | ||
566 | |||
567 | public LSL_Integer llGetListEntryType(LSL_List src, int index) | 574 | public LSL_Integer llGetListEntryType(LSL_List src, int index) |
568 | { | 575 | { |
569 | return m_LSL_Functions.llGetListEntryType(src, index); | 576 | return m_LSL_Functions.llGetListEntryType(src, index); |
@@ -859,11 +866,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
859 | return m_LSL_Functions.llGetUnixTime(); | 866 | return m_LSL_Functions.llGetUnixTime(); |
860 | } | 867 | } |
861 | 868 | ||
862 | public LSL_Integer llGetUsedMemory() | ||
863 | { | ||
864 | return m_LSL_Functions.llGetUsedMemory(); | ||
865 | } | ||
866 | |||
867 | public LSL_Vector llGetVel() | 869 | public LSL_Vector llGetVel() |
868 | { | 870 | { |
869 | return m_LSL_Functions.llGetVel(); | 871 | return m_LSL_Functions.llGetVel(); |
@@ -884,9 +886,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
884 | m_LSL_Functions.llGiveInventoryList(destination, category, inventory); | 886 | m_LSL_Functions.llGiveInventoryList(destination, category, inventory); |
885 | } | 887 | } |
886 | 888 | ||
887 | public void llGiveMoney(string destination, int amount) | 889 | public LSL_Integer llGiveMoney(string destination, int amount) |
888 | { | 890 | { |
889 | m_LSL_Functions.llGiveMoney(destination, amount); | 891 | return m_LSL_Functions.llGiveMoney(destination, amount); |
890 | } | 892 | } |
891 | 893 | ||
892 | public LSL_String llTransferLindenDollars(string destination, int amount) | 894 | public LSL_String llTransferLindenDollars(string destination, int amount) |
@@ -1463,6 +1465,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1463 | m_LSL_Functions.llSay(channelID, text); | 1465 | m_LSL_Functions.llSay(channelID, text); |
1464 | } | 1466 | } |
1465 | 1467 | ||
1468 | public LSL_Integer llScaleByFactor(double scaling_factor) | ||
1469 | { | ||
1470 | return m_LSL_Functions.llScaleByFactor(scaling_factor); | ||
1471 | } | ||
1472 | |||
1473 | public LSL_Float llGetMaxScaleFactor() | ||
1474 | { | ||
1475 | return m_LSL_Functions.llGetMaxScaleFactor(); | ||
1476 | } | ||
1477 | |||
1478 | public LSL_Float llGetMinScaleFactor() | ||
1479 | { | ||
1480 | return m_LSL_Functions.llGetMinScaleFactor(); | ||
1481 | } | ||
1482 | |||
1466 | public void llScaleTexture(double u, double v, int face) | 1483 | public void llScaleTexture(double u, double v, int face) |
1467 | { | 1484 | { |
1468 | m_LSL_Functions.llScaleTexture(u, v, face); | 1485 | m_LSL_Functions.llScaleTexture(u, v, face); |
@@ -1563,6 +1580,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1563 | m_LSL_Functions.llSetVelocity(force, local); | 1580 | m_LSL_Functions.llSetVelocity(force, local); |
1564 | } | 1581 | } |
1565 | 1582 | ||
1583 | |||
1566 | public void llSetAngularVelocity(LSL_Vector force, int local) | 1584 | public void llSetAngularVelocity(LSL_Vector force, int local) |
1567 | { | 1585 | { |
1568 | m_LSL_Functions.llSetAngularVelocity(force, local); | 1586 | m_LSL_Functions.llSetAngularVelocity(force, local); |
@@ -1643,6 +1661,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1643 | m_LSL_Functions.llSetPos(pos); | 1661 | m_LSL_Functions.llSetPos(pos); |
1644 | } | 1662 | } |
1645 | 1663 | ||
1664 | public LSL_Integer llSetRegionPos(LSL_Vector pos) | ||
1665 | { | ||
1666 | return m_LSL_Functions.llSetRegionPos(pos); | ||
1667 | } | ||
1668 | |||
1646 | public void llSetPrimitiveParams(LSL_List rules) | 1669 | public void llSetPrimitiveParams(LSL_List rules) |
1647 | { | 1670 | { |
1648 | m_LSL_Functions.llSetPrimitiveParams(rules); | 1671 | m_LSL_Functions.llSetPrimitiveParams(rules); |
@@ -1658,11 +1681,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1658 | m_LSL_Functions.llSetPrimURL(url); | 1681 | m_LSL_Functions.llSetPrimURL(url); |
1659 | } | 1682 | } |
1660 | 1683 | ||
1661 | public LSL_Integer llSetRegionPos(LSL_Vector pos) | ||
1662 | { | ||
1663 | return m_LSL_Functions.llSetRegionPos(pos); | ||
1664 | } | ||
1665 | |||
1666 | public void llSetRemoteScriptAccessPin(int pin) | 1684 | public void llSetRemoteScriptAccessPin(int pin) |
1667 | { | 1685 | { |
1668 | m_LSL_Functions.llSetRemoteScriptAccessPin(pin); | 1686 | m_LSL_Functions.llSetRemoteScriptAccessPin(pin); |
@@ -1977,7 +1995,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1977 | { | 1995 | { |
1978 | return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2); | 1996 | return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2); |
1979 | } | 1997 | } |
1980 | 1998 | ||
1981 | public LSL_List llGetPrimMediaParams(int face, LSL_List rules) | 1999 | public LSL_List llGetPrimMediaParams(int face, LSL_List rules) |
1982 | { | 2000 | { |
1983 | return m_LSL_Functions.llGetPrimMediaParams(face, rules); | 2001 | return m_LSL_Functions.llGetPrimMediaParams(face, rules); |
@@ -2008,9 +2026,64 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
2008 | return m_LSL_Functions.llClearLinkMedia(link, face); | 2026 | return m_LSL_Functions.llClearLinkMedia(link, face); |
2009 | } | 2027 | } |
2010 | 2028 | ||
2011 | public void print(string str) | 2029 | public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link) |
2030 | { | ||
2031 | return m_LSL_Functions.llGetLinkNumberOfSides(link); | ||
2032 | } | ||
2033 | |||
2034 | public void llSetKeyframedMotion(LSL_List frames, LSL_List options) | ||
2035 | { | ||
2036 | m_LSL_Functions.llSetKeyframedMotion(frames, options); | ||
2037 | } | ||
2038 | |||
2039 | public void llSetPhysicsMaterial(int material_bits, LSL_Float material_gravity_modifier, LSL_Float material_restitution, LSL_Float material_friction, LSL_Float material_density) | ||
2040 | { | ||
2041 | m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density); | ||
2042 | } | ||
2043 | |||
2044 | public LSL_List llGetPhysicsMaterial() | ||
2045 | { | ||
2046 | return m_LSL_Functions.llGetPhysicsMaterial(); | ||
2047 | } | ||
2048 | |||
2049 | public void llSetAnimationOverride(LSL_String animState, LSL_String anim) | ||
2050 | { | ||
2051 | m_LSL_Functions.llSetAnimationOverride(animState, anim); | ||
2052 | } | ||
2053 | |||
2054 | public void llResetAnimationOverride(LSL_String anim_state) | ||
2055 | { | ||
2056 | m_LSL_Functions.llResetAnimationOverride(anim_state); | ||
2057 | } | ||
2058 | |||
2059 | public LSL_String llGetAnimationOverride(LSL_String anim_state) | ||
2060 | { | ||
2061 | return m_LSL_Functions.llGetAnimationOverride(anim_state); | ||
2062 | } | ||
2063 | |||
2064 | public LSL_String llJsonGetValue(LSL_String json, LSL_List specifiers) | ||
2065 | { | ||
2066 | return m_LSL_Functions.llJsonGetValue(json, specifiers); | ||
2067 | } | ||
2068 | |||
2069 | public LSL_List llJson2List(LSL_String json) | ||
2070 | { | ||
2071 | return m_LSL_Functions.llJson2List(json); | ||
2072 | } | ||
2073 | |||
2074 | public LSL_String llList2Json(LSL_String type, LSL_List values) | ||
2075 | { | ||
2076 | return m_LSL_Functions.llList2Json(type, values); | ||
2077 | } | ||
2078 | |||
2079 | public LSL_String llJsonSetValue(LSL_String json, LSL_List specifiers, LSL_String value) | ||
2080 | { | ||
2081 | return m_LSL_Functions.llJsonSetValue(json, specifiers, value); | ||
2082 | } | ||
2083 | |||
2084 | public LSL_String llJsonValueType(LSL_String json, LSL_List specifiers) | ||
2012 | { | 2085 | { |
2013 | m_LSL_Functions.print(str); | 2086 | return m_LSL_Functions.llJsonValueType(json, specifiers); |
2014 | } | 2087 | } |
2015 | } | 2088 | } |
2016 | } | 2089 | } |