diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 10 |
1 files changed, 5 insertions, 5 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..5fdbf9d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -440,11 +440,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
440 | return m_OSSL_Functions.osParseJSON(JSON); | 440 | return m_OSSL_Functions.osParseJSON(JSON); |
441 | } | 441 | } |
442 | 442 | ||
443 | public Object osParseJSONNew(string JSON) | ||
444 | { | ||
445 | return m_OSSL_Functions.osParseJSONNew(JSON); | ||
446 | } | ||
447 | |||
448 | public void osMessageObject(key objectUUID,string message) | 443 | public void osMessageObject(key objectUUID,string message) |
449 | { | 444 | { |
450 | m_OSSL_Functions.osMessageObject(objectUUID,message); | 445 | m_OSSL_Functions.osMessageObject(objectUUID,message); |
@@ -744,14 +739,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
744 | if (Position.y > ((int)Constants.RegionSize - 1)) | 739 | if (Position.y > ((int)Constants.RegionSize - 1)) |
745 | Position.y = ((int)Constants.RegionSize - 1); | 740 | Position.y = ((int)Constants.RegionSize - 1); |
746 | */ | 741 | */ |
742 | <<<<<<< HEAD | ||
747 | if (Position.z > Constants.RegionHeight) | 743 | if (Position.z > Constants.RegionHeight) |
748 | Position.z = Constants.RegionHeight; | 744 | Position.z = Constants.RegionHeight; |
745 | ======= | ||
746 | >>>>>>> avn/ubitvar | ||
749 | if (Position.x < 0) | 747 | if (Position.x < 0) |
750 | Position.x = 0; | 748 | Position.x = 0; |
751 | if (Position.y < 0) | 749 | if (Position.y < 0) |
752 | Position.y = 0; | 750 | Position.y = 0; |
753 | if (Position.z < 0) | 751 | if (Position.z < 0) |
754 | Position.z = 0; | 752 | Position.z = 0; |
753 | if (Position.z > Constants.RegionHeight) | ||
754 | Position.z = Constants.RegionHeight; | ||
755 | prim.OSSL.llSetPos(Position); | 755 | prim.OSSL.llSetPos(Position); |
756 | } | 756 | } |
757 | 757 | ||