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/OSSL_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/OSSL_Stub.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 173 |
1 files changed, 157 insertions, 16 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index a60f381..30ff764 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -153,6 +153,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
153 | return m_OSSL_Functions.osSetDynamicTextureData(dynamicID, contentType, data, extraParams, timer); | 153 | return m_OSSL_Functions.osSetDynamicTextureData(dynamicID, contentType, data, extraParams, timer); |
154 | } | 154 | } |
155 | 155 | ||
156 | public string osSetDynamicTextureDataFace(string dynamicID, string contentType, string data, string extraParams, | ||
157 | int timer, int face) | ||
158 | { | ||
159 | return m_OSSL_Functions.osSetDynamicTextureDataFace(dynamicID, contentType, data, extraParams, timer, face); | ||
160 | } | ||
161 | |||
156 | public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, | 162 | public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, |
157 | int timer, int alpha) | 163 | int timer, int alpha) |
158 | { | 164 | { |
@@ -209,6 +215,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
209 | return m_OSSL_Functions.osRegionRestart(seconds); | 215 | return m_OSSL_Functions.osRegionRestart(seconds); |
210 | } | 216 | } |
211 | 217 | ||
218 | public int osRegionRestart(double seconds, string msg) | ||
219 | { | ||
220 | return m_OSSL_Functions.osRegionRestart(seconds, msg); | ||
221 | } | ||
222 | |||
212 | public void osRegionNotice(string msg) | 223 | public void osRegionNotice(string msg) |
213 | { | 224 | { |
214 | m_OSSL_Functions.osRegionNotice(msg); | 225 | m_OSSL_Functions.osRegionNotice(msg); |
@@ -266,15 +277,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
266 | m_OSSL_Functions.osTeleportOwner(position, lookat); | 277 | m_OSSL_Functions.osTeleportOwner(position, lookat); |
267 | } | 278 | } |
268 | 279 | ||
269 | // Avatar info functions | 280 | public LSL_List osGetAgents() |
270 | public string osGetAgentIP(string agent) | ||
271 | { | 281 | { |
272 | return m_OSSL_Functions.osGetAgentIP(agent); | 282 | return m_OSSL_Functions.osGetAgents(); |
273 | } | 283 | } |
274 | 284 | ||
275 | public LSL_List osGetAgents() | 285 | public string osGetAgentIP(string agent) |
276 | { | 286 | { |
277 | return m_OSSL_Functions.osGetAgents(); | 287 | return m_OSSL_Functions.osGetAgentIP(agent); |
278 | } | 288 | } |
279 | 289 | ||
280 | // Animation Functions | 290 | // Animation Functions |
@@ -350,6 +360,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
350 | return m_OSSL_Functions.osDrawEllipse(drawList, width, height); | 360 | return m_OSSL_Functions.osDrawEllipse(drawList, width, height); |
351 | } | 361 | } |
352 | 362 | ||
363 | public string osDrawFilledEllipse(string drawList, int width, int height) | ||
364 | { | ||
365 | return m_OSSL_Functions.osDrawFilledEllipse(drawList, width, height); | ||
366 | } | ||
367 | |||
353 | public string osDrawRectangle(string drawList, int width, int height) | 368 | public string osDrawRectangle(string drawList, int width, int height) |
354 | { | 369 | { |
355 | return m_OSSL_Functions.osDrawRectangle(drawList, width, height); | 370 | return m_OSSL_Functions.osDrawRectangle(drawList, width, height); |
@@ -370,6 +385,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
370 | return m_OSSL_Functions.osDrawFilledPolygon(drawList, x, y); | 385 | return m_OSSL_Functions.osDrawFilledPolygon(drawList, x, y); |
371 | } | 386 | } |
372 | 387 | ||
388 | public string osDrawResetTransform(string drawList) | ||
389 | { | ||
390 | return m_OSSL_Functions.osDrawResetTransform(drawList); | ||
391 | } | ||
392 | |||
393 | public string osDrawRotationTransform(string drawList, LSL_Float x) | ||
394 | { | ||
395 | return m_OSSL_Functions.osDrawRotationTransform(drawList, x); | ||
396 | } | ||
397 | |||
398 | public string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y) | ||
399 | { | ||
400 | return m_OSSL_Functions.osDrawScaleTransform(drawList, x, y); | ||
401 | } | ||
402 | |||
403 | public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y) | ||
404 | { | ||
405 | return m_OSSL_Functions.osDrawTranslationTransform(drawList, x, y); | ||
406 | } | ||
407 | |||
373 | public string osSetFontSize(string drawList, int fontSize) | 408 | public string osSetFontSize(string drawList, int fontSize) |
374 | { | 409 | { |
375 | return m_OSSL_Functions.osSetFontSize(drawList, fontSize); | 410 | return m_OSSL_Functions.osSetFontSize(drawList, fontSize); |
@@ -394,6 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
394 | { | 429 | { |
395 | return m_OSSL_Functions.osSetPenColor(drawList, color); | 430 | return m_OSSL_Functions.osSetPenColor(drawList, color); |
396 | } | 431 | } |
432 | |||
397 | // Deprecated | 433 | // Deprecated |
398 | public string osSetPenColour(string drawList, string colour) | 434 | public string osSetPenColour(string drawList, string colour) |
399 | { | 435 | { |
@@ -430,6 +466,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
430 | return m_OSSL_Functions.osGetPhysicsEngineType(); | 466 | return m_OSSL_Functions.osGetPhysicsEngineType(); |
431 | } | 467 | } |
432 | 468 | ||
469 | public string osGetPhysicsEngineName() | ||
470 | { | ||
471 | return m_OSSL_Functions.osGetPhysicsEngineName(); | ||
472 | } | ||
473 | |||
433 | public string osGetSimulatorVersion() | 474 | public string osGetSimulatorVersion() |
434 | { | 475 | { |
435 | return m_OSSL_Functions.osGetSimulatorVersion(); | 476 | return m_OSSL_Functions.osGetSimulatorVersion(); |
@@ -439,7 +480,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
439 | { | 480 | { |
440 | return m_OSSL_Functions.osParseJSON(JSON); | 481 | return m_OSSL_Functions.osParseJSON(JSON); |
441 | } | 482 | } |
442 | 483 | ||
443 | public Object osParseJSONNew(string JSON) | 484 | public Object osParseJSONNew(string JSON) |
444 | { | 485 | { |
445 | return m_OSSL_Functions.osParseJSONNew(JSON); | 486 | return m_OSSL_Functions.osParseJSONNew(JSON); |
@@ -529,7 +570,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
529 | { | 570 | { |
530 | return m_OSSL_Functions.osReplaceString(src,pattern,replace,count,start); | 571 | return m_OSSL_Functions.osReplaceString(src,pattern,replace,count,start); |
531 | } | 572 | } |
532 | 573 | ||
533 | 574 | ||
534 | // Information about data loaded into the region | 575 | // Information about data loaded into the region |
535 | public string osLoadedCreationDate() | 576 | public string osLoadedCreationDate() |
@@ -567,6 +608,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
567 | m_OSSL_Functions.osForceBreakAllLinks(); | 608 | m_OSSL_Functions.osForceBreakAllLinks(); |
568 | } | 609 | } |
569 | 610 | ||
611 | public void osDie(LSL_Key objectUUID) | ||
612 | { | ||
613 | m_OSSL_Functions.osDie(objectUUID); | ||
614 | } | ||
615 | |||
570 | public LSL_Integer osIsNpc(LSL_Key npc) | 616 | public LSL_Integer osIsNpc(LSL_Key npc) |
571 | { | 617 | { |
572 | return m_OSSL_Functions.osIsNpc(npc); | 618 | return m_OSSL_Functions.osIsNpc(npc); |
@@ -627,6 +673,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
627 | m_OSSL_Functions.osNpcStopMoveToTarget(npc); | 673 | m_OSSL_Functions.osNpcStopMoveToTarget(npc); |
628 | } | 674 | } |
629 | 675 | ||
676 | public void osNpcSetProfileAbout(LSL_Key npc, string about) | ||
677 | { | ||
678 | m_OSSL_Functions.osNpcSetProfileAbout(npc, about); | ||
679 | } | ||
680 | |||
681 | public void osNpcSetProfileImage(LSL_Key npc, string image) | ||
682 | { | ||
683 | m_OSSL_Functions.osNpcSetProfileImage(npc, image); | ||
684 | } | ||
685 | |||
630 | public void osNpcSay(key npc, string message) | 686 | public void osNpcSay(key npc, string message) |
631 | { | 687 | { |
632 | m_OSSL_Functions.osNpcSay(npc, message); | 688 | m_OSSL_Functions.osNpcSay(npc, message); |
@@ -744,14 +800,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
744 | if (Position.y > ((int)Constants.RegionSize - 1)) | 800 | if (Position.y > ((int)Constants.RegionSize - 1)) |
745 | Position.y = ((int)Constants.RegionSize - 1); | 801 | Position.y = ((int)Constants.RegionSize - 1); |
746 | */ | 802 | */ |
747 | if (Position.z > Constants.RegionHeight) | ||
748 | Position.z = Constants.RegionHeight; | ||
749 | if (Position.x < 0) | 803 | if (Position.x < 0) |
750 | Position.x = 0; | 804 | Position.x = 0; |
751 | if (Position.y < 0) | 805 | if (Position.y < 0) |
752 | Position.y = 0; | 806 | Position.y = 0; |
753 | if (Position.z < 0) | 807 | if (Position.z < 0) |
754 | Position.z = 0; | 808 | Position.z = 0; |
809 | if (Position.z > Constants.RegionHeight) | ||
810 | Position.z = Constants.RegionHeight; | ||
755 | prim.OSSL.llSetPos(Position); | 811 | prim.OSSL.llSetPos(Position); |
756 | } | 812 | } |
757 | 813 | ||
@@ -889,7 +945,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
889 | { | 945 | { |
890 | return m_OSSL_Functions.osGetRegionMapTexture(regionName); | 946 | return m_OSSL_Functions.osGetRegionMapTexture(regionName); |
891 | } | 947 | } |
892 | 948 | ||
893 | public LSL_List osGetRegionStats() | 949 | public LSL_List osGetRegionStats() |
894 | { | 950 | { |
895 | return m_OSSL_Functions.osGetRegionStats(); | 951 | return m_OSSL_Functions.osGetRegionStats(); |
@@ -902,19 +958,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
902 | 958 | ||
903 | /// <summary> | 959 | /// <summary> |
904 | /// Returns the amount of memory in use by the Simulator Daemon. | 960 | /// Returns the amount of memory in use by the Simulator Daemon. |
905 | /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware) | 961 | /// Amount in bytes - if >= 2GB, returns 2GB. (LSL is not 64-bit aware) |
906 | /// </summary> | 962 | /// </summary> |
907 | /// <returns></returns> | 963 | /// <returns></returns> |
908 | public LSL_Integer osGetSimulatorMemory() | 964 | public LSL_Integer osGetSimulatorMemory() |
909 | { | 965 | { |
910 | return m_OSSL_Functions.osGetSimulatorMemory(); | 966 | return m_OSSL_Functions.osGetSimulatorMemory(); |
911 | } | 967 | } |
912 | 968 | ||
969 | public LSL_Integer osGetSimulatorMemoryKB() | ||
970 | { | ||
971 | return m_OSSL_Functions.osGetSimulatorMemoryKB(); | ||
972 | } | ||
973 | |||
913 | public void osKickAvatar(string FirstName,string SurName,string alert) | 974 | public void osKickAvatar(string FirstName,string SurName,string alert) |
914 | { | 975 | { |
915 | m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); | 976 | m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); |
916 | } | 977 | } |
917 | 978 | ||
918 | public void osSetSpeed(string UUID, LSL_Float SpeedModifier) | 979 | public void osSetSpeed(string UUID, LSL_Float SpeedModifier) |
919 | { | 980 | { |
920 | m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); | 981 | m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); |
@@ -929,12 +990,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
929 | { | 990 | { |
930 | m_OSSL_Functions.osCauseDamage(avatar, damage); | 991 | m_OSSL_Functions.osCauseDamage(avatar, damage); |
931 | } | 992 | } |
932 | 993 | ||
933 | public void osCauseHealing(string avatar, double healing) | 994 | public void osCauseHealing(string avatar, double healing) |
934 | { | 995 | { |
935 | m_OSSL_Functions.osCauseHealing(avatar, healing); | 996 | m_OSSL_Functions.osCauseHealing(avatar, healing); |
936 | } | 997 | } |
937 | 998 | ||
999 | public void osSetHealth(string avatar, double health) | ||
1000 | { | ||
1001 | m_OSSL_Functions.osSetHealth(avatar, health); | ||
1002 | } | ||
1003 | |||
1004 | public void osSetHealRate(string avatar, double health) | ||
1005 | { | ||
1006 | m_OSSL_Functions.osSetHealRate(avatar, health); | ||
1007 | } | ||
1008 | |||
1009 | public LSL_Float osGetHealRate(string avatar) | ||
1010 | { | ||
1011 | return m_OSSL_Functions.osGetHealRate(avatar); | ||
1012 | } | ||
1013 | |||
938 | public void osForceOtherSit(string avatar) | 1014 | public void osForceOtherSit(string avatar) |
939 | { | 1015 | { |
940 | m_OSSL_Functions.osForceOtherSit(avatar); | 1016 | m_OSSL_Functions.osForceOtherSit(avatar); |
@@ -944,12 +1020,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
944 | { | 1020 | { |
945 | m_OSSL_Functions.osForceOtherSit(avatar, target); | 1021 | m_OSSL_Functions.osForceOtherSit(avatar, target); |
946 | } | 1022 | } |
947 | 1023 | ||
948 | public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules) | 1024 | public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules) |
949 | { | 1025 | { |
950 | return m_OSSL_Functions.osGetPrimitiveParams(prim, rules); | 1026 | return m_OSSL_Functions.osGetPrimitiveParams(prim, rules); |
951 | } | 1027 | } |
952 | 1028 | ||
953 | public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules) | 1029 | public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules) |
954 | { | 1030 | { |
955 | m_OSSL_Functions.osSetPrimitiveParams(prim, rules); | 1031 | m_OSSL_Functions.osSetPrimitiveParams(prim, rules); |
@@ -970,6 +1046,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
970 | return m_OSSL_Functions.osGetAvatarList(); | 1046 | return m_OSSL_Functions.osGetAvatarList(); |
971 | } | 1047 | } |
972 | 1048 | ||
1049 | public LSL_List osGetNPCList() | ||
1050 | { | ||
1051 | return m_OSSL_Functions.osGetNPCList(); | ||
1052 | } | ||
1053 | |||
973 | public LSL_String osUnixTimeToTimestamp(long time) | 1054 | public LSL_String osUnixTimeToTimestamp(long time) |
974 | { | 1055 | { |
975 | return m_OSSL_Functions.osUnixTimeToTimestamp(time); | 1056 | return m_OSSL_Functions.osUnixTimeToTimestamp(time); |
@@ -1054,5 +1135,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1054 | { | 1135 | { |
1055 | return m_OSSL_Functions.osRegexIsMatch(input, pattern); | 1136 | return m_OSSL_Functions.osRegexIsMatch(input, pattern); |
1056 | } | 1137 | } |
1138 | |||
1139 | public LSL_String osRequestURL(LSL_List options) | ||
1140 | { | ||
1141 | return m_OSSL_Functions.osRequestURL(options); | ||
1142 | } | ||
1143 | |||
1144 | public LSL_String osRequestSecureURL(LSL_List options) | ||
1145 | { | ||
1146 | return m_OSSL_Functions.osRequestSecureURL(options); | ||
1147 | } | ||
1148 | |||
1149 | public void osCollisionSound(string impact_sound, double impact_volume) | ||
1150 | { | ||
1151 | m_OSSL_Functions.osCollisionSound(impact_sound, impact_volume); | ||
1152 | } | ||
1153 | |||
1154 | public void osVolumeDetect(int detect) | ||
1155 | { | ||
1156 | m_OSSL_Functions.osVolumeDetect(detect); | ||
1157 | } | ||
1158 | |||
1159 | public LSL_List osGetInertiaData() | ||
1160 | { | ||
1161 | return m_OSSL_Functions.osGetInertiaData(); | ||
1162 | } | ||
1163 | |||
1164 | public void osSetInertia(LSL_Float mass, vector centerOfMass, vector principalInertiaScaled, rotation rot) | ||
1165 | { | ||
1166 | m_OSSL_Functions.osSetInertia(mass, centerOfMass, principalInertiaScaled, rot); | ||
1167 | } | ||
1168 | |||
1169 | public void osSetInertiaAsBox(LSL_Float mass, vector boxSize, vector centerOfMass, rotation rot) | ||
1170 | { | ||
1171 | m_OSSL_Functions.osSetInertiaAsBox(mass, boxSize, centerOfMass, rot); | ||
1172 | } | ||
1173 | |||
1174 | public void osSetInertiaAsSphere(LSL_Float mass, LSL_Float radius, vector centerOfMass) | ||
1175 | { | ||
1176 | m_OSSL_Functions.osSetInertiaAsSphere(mass, radius, centerOfMass); | ||
1177 | } | ||
1178 | |||
1179 | public void osSetInertiaAsCylinder(LSL_Float mass, LSL_Float radius, LSL_Float lenght, vector centerOfMass,rotation lslrot) | ||
1180 | { | ||
1181 | m_OSSL_Functions.osSetInertiaAsCylinder( mass, radius, lenght, centerOfMass, lslrot); | ||
1182 | } | ||
1183 | |||
1184 | public void osClearInertia() | ||
1185 | { | ||
1186 | m_OSSL_Functions.osClearInertia(); | ||
1187 | } | ||
1188 | |||
1189 | public LSL_Integer osTeleportObject(LSL_Key objectUUID, vector targetPos, rotation targetrotation, LSL_Integer flags) | ||
1190 | { | ||
1191 | return m_OSSL_Functions.osTeleportObject(objectUUID, targetPos, targetrotation, flags); | ||
1192 | } | ||
1193 | |||
1194 | public LSL_Integer osGetLinkNumber(LSL_String name) | ||
1195 | { | ||
1196 | return m_OSSL_Functions.osGetLinkNumber(name); | ||
1197 | } | ||
1057 | } | 1198 | } |
1058 | } | 1199 | } |