... ossl merge issue

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
             }
         }
 
-        private Object osParseJSONNew(string JSON)
+        public Object osParseJSONNew(string JSON)
         {
             CheckThreatLevel(ThreatLevel.None, "osParseJSONNew");
 
@@ -3263,7 +3263,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 Scene scene = m_ScriptEngine.World;
                 GridRegion region = scene.GridService.GetRegionByUUID(UUID.Zero, World.RegionInfo.RegionID);
-                return new LSL_Vector(region.RegionSizeX, region.RegionSizeY, Constants.RegionHeight);
+                return new LSL_Vector((float)region.RegionSizeX, (float)region.RegionSizeY, (float)Constants.RegionHeight);
             }
         }