OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

... ossl merge issue

avinationmerge
UbitUmarov 2015-09-28 16:40:55 +01:00
parent fd20a9576d
commit fb69661bb9
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

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

1
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -261,6 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
string osGetSimulatorVersion(); string osGetSimulatorVersion();
LSL_Integer osCheckODE(); LSL_Integer osCheckODE();
string osGetPhysicsEngineType(); string osGetPhysicsEngineType();
Object osParseJSONNew(string JSON);
Hashtable osParseJSON(string JSON); Hashtable osParseJSON(string JSON);
void osMessageObject(key objectUUID,string message); void osMessageObject(key objectUUID,string message);

9
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -439,7 +439,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{ {
return m_OSSL_Functions.osParseJSON(JSON); return m_OSSL_Functions.osParseJSON(JSON);
} }
public Object osParseJSONNew(string JSON)
{
return m_OSSL_Functions.osParseJSONNew(JSON);
}
public void osMessageObject(key objectUUID,string message) public void osMessageObject(key objectUUID,string message)
{ {
m_OSSL_Functions.osMessageObject(objectUUID,message); m_OSSL_Functions.osMessageObject(objectUUID,message);
@ -739,8 +744,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
if (Position.y > ((int)Constants.RegionSize - 1)) if (Position.y > ((int)Constants.RegionSize - 1))
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) if (Position.x < 0)
Position.x = 0; Position.x = 0;
if (Position.y < 0) if (Position.y < 0)