diff options
author | UbitUmarov | 2015-09-28 16:40:55 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-28 16:40:55 +0100 |
commit | fb69661bb9c98b959a57e4e54a756c09a804e344 (patch) | |
tree | 791a5df585faec1b46bacc5a2abc2c4c2fe78207 /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | ... post merge issue (diff) | |
download | opensim-SC_OLD-fb69661bb9c98b959a57e4e54a756c09a804e344.zip opensim-SC_OLD-fb69661bb9c98b959a57e4e54a756c09a804e344.tar.gz opensim-SC_OLD-fb69661bb9c98b959a57e4e54a756c09a804e344.tar.bz2 opensim-SC_OLD-fb69661bb9c98b959a57e4e54a756c09a804e344.tar.xz |
... ossl merge issue
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
3 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index a87ee73..39eb5a5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1730,7 +1730,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1730 | } | 1730 | } |
1731 | } | 1731 | } |
1732 | 1732 | ||
1733 | private Object osParseJSONNew(string JSON) | 1733 | public Object osParseJSONNew(string JSON) |
1734 | { | 1734 | { |
1735 | CheckThreatLevel(ThreatLevel.None, "osParseJSONNew"); | 1735 | CheckThreatLevel(ThreatLevel.None, "osParseJSONNew"); |
1736 | 1736 | ||
@@ -3263,7 +3263,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3263 | { | 3263 | { |
3264 | Scene scene = m_ScriptEngine.World; | 3264 | Scene scene = m_ScriptEngine.World; |
3265 | GridRegion region = scene.GridService.GetRegionByUUID(UUID.Zero, World.RegionInfo.RegionID); | 3265 | GridRegion region = scene.GridService.GetRegionByUUID(UUID.Zero, World.RegionInfo.RegionID); |
3266 | return new LSL_Vector(region.RegionSizeX, region.RegionSizeY, Constants.RegionHeight); | 3266 | return new LSL_Vector((float)region.RegionSizeX, (float)region.RegionSizeY, (float)Constants.RegionHeight); |
3267 | } | 3267 | } |
3268 | } | 3268 | } |
3269 | 3269 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index ddd7630..4e567e6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -261,6 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
261 | string osGetSimulatorVersion(); | 261 | string osGetSimulatorVersion(); |
262 | LSL_Integer osCheckODE(); | 262 | LSL_Integer osCheckODE(); |
263 | string osGetPhysicsEngineType(); | 263 | string osGetPhysicsEngineType(); |
264 | Object osParseJSONNew(string JSON); | ||
264 | Hashtable osParseJSON(string JSON); | 265 | Hashtable osParseJSON(string JSON); |
265 | 266 | ||
266 | void osMessageObject(key objectUUID,string message); | 267 | void osMessageObject(key objectUUID,string message); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 6e8a96d..31393bb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -439,7 +439,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
439 | { | 439 | { |
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 | |||
443 | public void osMessageObject(key objectUUID,string message) | 448 | public void osMessageObject(key objectUUID,string message) |
444 | { | 449 | { |
445 | m_OSSL_Functions.osMessageObject(objectUUID,message); | 450 | m_OSSL_Functions.osMessageObject(objectUUID,message); |
@@ -739,8 +744,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
739 | if (Position.y > ((int)Constants.RegionSize - 1)) | 744 | if (Position.y > ((int)Constants.RegionSize - 1)) |
740 | Position.y = ((int)Constants.RegionSize - 1); | 745 | Position.y = ((int)Constants.RegionSize - 1); |
741 | */ | 746 | */ |
742 | if (Position.z > Constants.RegionHeight) | ||
743 | Position.z = Constants.RegionHeight; | ||
744 | if (Position.x < 0) | 747 | if (Position.x < 0) |
745 | Position.x = 0; | 748 | Position.x = 0; |
746 | if (Position.y < 0) | 749 | if (Position.y < 0) |