From fb69661bb9c98b959a57e4e54a756c09a804e344 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Mon, 28 Sep 2015 16:40:55 +0100
Subject: [PATCH]  ... ossl merge issue

---
 .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs   | 4 ++--
 .../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs       | 1 +
 .../Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs  | 9 ++++++---
 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 a87ee734fb..39eb5a552e 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);
             }
         }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index ddd7630f09..4e567e6bb3 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
         string osGetSimulatorVersion();
         LSL_Integer osCheckODE();
         string osGetPhysicsEngineType();
+        Object osParseJSONNew(string JSON);
         Hashtable osParseJSON(string JSON);
 
         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 6e8a96d2ac..31393bbb70 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
         {
             return m_OSSL_Functions.osParseJSON(JSON);
         }
-        
+
+        public Object osParseJSONNew(string JSON)
+        {
+            return m_OSSL_Functions.osParseJSONNew(JSON);
+        }
+
         public void osMessageObject(key objectUUID,string message)
         {
             m_OSSL_Functions.osMessageObject(objectUUID,message);
@@ -739,8 +744,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
                 if (Position.y > ((int)Constants.RegionSize - 1))
                     Position.y = ((int)Constants.RegionSize - 1);
                  */
-                if (Position.z > Constants.RegionHeight)
-                    Position.z = Constants.RegionHeight;
                 if (Position.x < 0)
                     Position.x = 0;
                 if (Position.y < 0)