diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 60 |
1 files changed, 56 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index afa9ae0..a60f381 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -420,6 +420,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
420 | return m_OSSL_Functions.osGetScriptEngineName(); | 420 | return m_OSSL_Functions.osGetScriptEngineName(); |
421 | } | 421 | } |
422 | 422 | ||
423 | public LSL_Integer osCheckODE() | ||
424 | { | ||
425 | return m_OSSL_Functions.osCheckODE(); | ||
426 | } | ||
427 | |||
428 | public string osGetPhysicsEngineType() | ||
429 | { | ||
430 | return m_OSSL_Functions.osGetPhysicsEngineType(); | ||
431 | } | ||
432 | |||
423 | public string osGetSimulatorVersion() | 433 | public string osGetSimulatorVersion() |
424 | { | 434 | { |
425 | return m_OSSL_Functions.osGetSimulatorVersion(); | 435 | return m_OSSL_Functions.osGetSimulatorVersion(); |
@@ -500,6 +510,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
500 | return m_OSSL_Functions.osGetGridCustom(key); | 510 | return m_OSSL_Functions.osGetGridCustom(key); |
501 | } | 511 | } |
502 | 512 | ||
513 | public string osGetAvatarHomeURI(string uuid) | ||
514 | { | ||
515 | return m_OSSL_Functions.osGetAvatarHomeURI(uuid); | ||
516 | } | ||
517 | |||
503 | public LSL_String osFormatString(string str, LSL_List strings) | 518 | public LSL_String osFormatString(string str, LSL_List strings) |
504 | { | 519 | { |
505 | return m_OSSL_Functions.osFormatString(str, strings); | 520 | return m_OSSL_Functions.osFormatString(str, strings); |
@@ -537,6 +552,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
537 | return m_OSSL_Functions.osGetLinkPrimitiveParams(linknumber, rules); | 552 | return m_OSSL_Functions.osGetLinkPrimitiveParams(linknumber, rules); |
538 | } | 553 | } |
539 | 554 | ||
555 | public void osForceCreateLink(string target, int parent) | ||
556 | { | ||
557 | m_OSSL_Functions.osForceCreateLink(target, parent); | ||
558 | } | ||
559 | |||
560 | public void osForceBreakLink(int linknum) | ||
561 | { | ||
562 | m_OSSL_Functions.osForceBreakLink(linknum); | ||
563 | } | ||
564 | |||
565 | public void osForceBreakAllLinks() | ||
566 | { | ||
567 | m_OSSL_Functions.osForceBreakAllLinks(); | ||
568 | } | ||
569 | |||
540 | public LSL_Integer osIsNpc(LSL_Key npc) | 570 | public LSL_Integer osIsNpc(LSL_Key npc) |
541 | { | 571 | { |
542 | return m_OSSL_Functions.osIsNpc(npc); | 572 | return m_OSSL_Functions.osIsNpc(npc); |
@@ -708,16 +738,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
708 | } | 738 | } |
709 | private void Save() | 739 | private void Save() |
710 | { | 740 | { |
741 | /* Remove temporarily until we have a handle to the region size | ||
711 | if (Position.x > ((int)Constants.RegionSize - 1)) | 742 | if (Position.x > ((int)Constants.RegionSize - 1)) |
712 | Position.x = ((int)Constants.RegionSize - 1); | 743 | Position.x = ((int)Constants.RegionSize - 1); |
713 | if (Position.x < 0) | ||
714 | Position.x = 0; | ||
715 | if (Position.y > ((int)Constants.RegionSize - 1)) | 744 | if (Position.y > ((int)Constants.RegionSize - 1)) |
716 | Position.y = ((int)Constants.RegionSize - 1); | 745 | Position.y = ((int)Constants.RegionSize - 1); |
746 | */ | ||
747 | if (Position.z > Constants.RegionHeight) | ||
748 | Position.z = Constants.RegionHeight; | ||
749 | if (Position.x < 0) | ||
750 | Position.x = 0; | ||
717 | if (Position.y < 0) | 751 | if (Position.y < 0) |
718 | Position.y = 0; | 752 | Position.y = 0; |
719 | if (Position.z > 768) | ||
720 | Position.z = 768; | ||
721 | if (Position.z < 0) | 753 | if (Position.z < 0) |
722 | Position.z = 0; | 754 | Position.z = 0; |
723 | prim.OSSL.llSetPos(Position); | 755 | prim.OSSL.llSetPos(Position); |
@@ -843,6 +875,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
843 | } | 875 | } |
844 | } | 876 | } |
845 | 877 | ||
878 | public string osGetGender(LSL_Key rawAvatarId) | ||
879 | { | ||
880 | return m_OSSL_Functions.osGetGender(rawAvatarId); | ||
881 | } | ||
882 | |||
846 | public key osGetMapTexture() | 883 | public key osGetMapTexture() |
847 | { | 884 | { |
848 | return m_OSSL_Functions.osGetMapTexture(); | 885 | return m_OSSL_Functions.osGetMapTexture(); |
@@ -858,6 +895,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
858 | return m_OSSL_Functions.osGetRegionStats(); | 895 | return m_OSSL_Functions.osGetRegionStats(); |
859 | } | 896 | } |
860 | 897 | ||
898 | public vector osGetRegionSize() | ||
899 | { | ||
900 | return m_OSSL_Functions.osGetRegionSize(); | ||
901 | } | ||
902 | |||
861 | /// <summary> | 903 | /// <summary> |
862 | /// Returns the amount of memory in use by the Simulator Daemon. | 904 | /// Returns the amount of memory in use by the Simulator Daemon. |
863 | /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware) | 905 | /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware) |
@@ -892,6 +934,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
892 | { | 934 | { |
893 | m_OSSL_Functions.osCauseHealing(avatar, healing); | 935 | m_OSSL_Functions.osCauseHealing(avatar, healing); |
894 | } | 936 | } |
937 | |||
938 | public void osForceOtherSit(string avatar) | ||
939 | { | ||
940 | m_OSSL_Functions.osForceOtherSit(avatar); | ||
941 | } | ||
942 | |||
943 | public void osForceOtherSit(string avatar, string target) | ||
944 | { | ||
945 | m_OSSL_Functions.osForceOtherSit(avatar, target); | ||
946 | } | ||
895 | 947 | ||
896 | public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules) | 948 | public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules) |
897 | { | 949 | { |