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/Implementation/OSSL_Api.cs | |
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/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 |
1 files changed, 2 insertions, 2 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 | ||