This is the second part of the 'not crash on regionsize changes'. This lets you configure region sizes to be smaller without crashing the region. I remind you that regions are still square, must be a multiple of 4, and the Linden client doesn't like anything other then 256. If you set it bigger or smaller, the terrain doesn't load in the client, the map has issues, and god forbid you connect it to a grid that expects 256m regions.
parent
c8a68fb3fb
commit
2b990a61bf
|
@ -317,8 +317,8 @@ namespace OpenSim.Region.CoreModules.World.Land
|
||||||
|
|
||||||
public void SendLandUpdate(ScenePresence avatar, bool force)
|
public void SendLandUpdate(ScenePresence avatar, bool force)
|
||||||
{
|
{
|
||||||
ILandObject over = GetLandObject((int)Math.Min(255, Math.Max(0, Math.Round(avatar.AbsolutePosition.X))),
|
ILandObject over = GetLandObject((int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.X))),
|
||||||
(int)Math.Min(255, Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
|
(int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
|
||||||
|
|
||||||
if (over != null)
|
if (over != null)
|
||||||
{
|
{
|
||||||
|
@ -849,10 +849,12 @@ namespace OpenSim.Region.CoreModules.World.Land
|
||||||
byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET];
|
byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET];
|
||||||
int byteArrayCount = 0;
|
int byteArrayCount = 0;
|
||||||
int sequenceID = 0;
|
int sequenceID = 0;
|
||||||
|
int blockmeters = 4 * (int) Constants.RegionSize/(int)Constants.TerrainPatchSize;
|
||||||
|
|
||||||
for (int y = 0; y < 64; y++)
|
|
||||||
|
for (int y = 0; y < blockmeters; y++)
|
||||||
{
|
{
|
||||||
for (int x = 0; x < 64; x++)
|
for (int x = 0; x < blockmeters; x++)
|
||||||
{
|
{
|
||||||
byte tempByte = 0; //This represents the byte for the current 4x4
|
byte tempByte = 0; //This represents the byte for the current 4x4
|
||||||
|
|
||||||
|
|
|
@ -305,8 +305,8 @@ namespace OpenSim.Region.CoreModules.World.Land
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
over =
|
over =
|
||||||
m_scene.LandChannel.GetLandObject(Util.Clamp<int>((int)Math.Round(avatars[i].AbsolutePosition.X), 0, 255),
|
m_scene.LandChannel.GetLandObject(Util.Clamp<int>((int)Math.Round(avatars[i].AbsolutePosition.X), 0, ((int)Constants.RegionSize - 1)),
|
||||||
Util.Clamp<int>((int)Math.Round(avatars[i].AbsolutePosition.Y), 0, 255));
|
Util.Clamp<int>((int)Math.Round(avatars[i].AbsolutePosition.Y), 0, ((int)Constants.RegionSize - 1)));
|
||||||
}
|
}
|
||||||
catch (Exception)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
|
@ -455,21 +455,21 @@ namespace OpenSim.Region.CoreModules.World.Land
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int tx = min_x * 4;
|
int tx = min_x * 4;
|
||||||
if (tx > 255)
|
if (tx > ((int)Constants.RegionSize - 1))
|
||||||
tx = 255;
|
tx = ((int)Constants.RegionSize - 1);
|
||||||
int ty = min_y * 4;
|
int ty = min_y * 4;
|
||||||
if (ty > 255)
|
if (ty > ((int)Constants.RegionSize - 1))
|
||||||
ty = 255;
|
ty = ((int)Constants.RegionSize - 1);
|
||||||
landData.AABBMin =
|
landData.AABBMin =
|
||||||
new Vector3((float) (min_x * 4), (float) (min_y * 4),
|
new Vector3((float) (min_x * 4), (float) (min_y * 4),
|
||||||
(float) m_scene.Heightmap[tx, ty]);
|
(float) m_scene.Heightmap[tx, ty]);
|
||||||
|
|
||||||
tx = max_x * 4;
|
tx = max_x * 4;
|
||||||
if (tx > 255)
|
if (tx > ((int)Constants.RegionSize - 1))
|
||||||
tx = 255;
|
tx = ((int)Constants.RegionSize - 1);
|
||||||
ty = max_y * 4;
|
ty = max_y * 4;
|
||||||
if (ty > 255)
|
if (ty > ((int)Constants.RegionSize - 1))
|
||||||
ty = 255;
|
ty = ((int)Constants.RegionSize - 1);
|
||||||
landData.AABBMax =
|
landData.AABBMax =
|
||||||
new Vector3((float) (max_x * 4), (float) (max_y * 4),
|
new Vector3((float) (max_x * 4), (float) (max_y * 4),
|
||||||
(float) m_scene.Heightmap[tx, ty]);
|
(float) m_scene.Heightmap[tx, ty]);
|
||||||
|
|
|
@ -1355,10 +1355,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
||||||
float X = position.X;
|
float X = position.X;
|
||||||
float Y = position.Y;
|
float Y = position.Y;
|
||||||
|
|
||||||
if (X > 255)
|
if (X > ((int)Constants.RegionSize - 1))
|
||||||
X = 255;
|
X = ((int)Constants.RegionSize - 1);
|
||||||
if (Y > 255)
|
if (Y > ((int)Constants.RegionSize - 1))
|
||||||
Y = 255;
|
Y = ((int)Constants.RegionSize - 1);
|
||||||
if (X < 0)
|
if (X < 0)
|
||||||
X = 0;
|
X = 0;
|
||||||
if (Y < 0)
|
if (Y < 0)
|
||||||
|
|
|
@ -331,9 +331,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
|
||||||
int mapdrawendY = (int)(pos.Y + scale.Y);
|
int mapdrawendY = (int)(pos.Y + scale.Y);
|
||||||
|
|
||||||
// If object is beyond the edge of the map, don't draw it to avoid errors
|
// If object is beyond the edge of the map, don't draw it to avoid errors
|
||||||
if (mapdrawstartX < 0 || mapdrawstartX > 255 || mapdrawendX < 0 || mapdrawendX > 255
|
if (mapdrawstartX < 0 || mapdrawstartX > ((int)Constants.RegionSize - 1) || mapdrawendX < 0 || mapdrawendX > ((int)Constants.RegionSize - 1)
|
||||||
|| mapdrawstartY < 0 || mapdrawstartY > 255 || mapdrawendY < 0
|
|| mapdrawstartY < 0 || mapdrawstartY > ((int)Constants.RegionSize - 1) || mapdrawendY < 0
|
||||||
|| mapdrawendY > 255)
|
|| mapdrawendY > ((int)Constants.RegionSize - 1))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
#region obb face reconstruction part duex
|
#region obb face reconstruction part duex
|
||||||
|
@ -537,7 +537,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
|
||||||
// float z = -point3d.z - topos.z;
|
// float z = -point3d.z - topos.z;
|
||||||
|
|
||||||
returnpt.X = (int)point3d.X;//(int)((topos.x - point3d.x) / z * d);
|
returnpt.X = (int)point3d.X;//(int)((topos.x - point3d.x) / z * d);
|
||||||
returnpt.Y = (int)(255 - point3d.Y);//(int)(255 - (((topos.y - point3d.y) / z * d)));
|
returnpt.Y = (int)(((int)Constants.RegionSize - 1) - point3d.Y);//(int)(255 - (((topos.y - point3d.y) / z * d)));
|
||||||
|
|
||||||
return returnpt;
|
return returnpt;
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,7 +107,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
|
||||||
// .
|
// .
|
||||||
//
|
//
|
||||||
// Shade the terrain for shadows
|
// Shade the terrain for shadows
|
||||||
if (x < 255 && yr < 255)
|
if (x < ((int)Constants.RegionSize - 1) && yr < ((int)Constants.RegionSize - 1))
|
||||||
{
|
{
|
||||||
float hfvalue = (float)hm[x, y];
|
float hfvalue = (float)hm[x, y];
|
||||||
float hfvaluecompare = 0f;
|
float hfvaluecompare = 0f;
|
||||||
|
|
|
@ -266,7 +266,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
|
||||||
// the heigthfield might have some jumps in values. Rendered land is smooth, though,
|
// the heigthfield might have some jumps in values. Rendered land is smooth, though,
|
||||||
// as a slope is rendered at that place. So average 4 neighbour values to emulate that.
|
// as a slope is rendered at that place. So average 4 neighbour values to emulate that.
|
||||||
private float getHeight(double[,] hm, int x, int y) {
|
private float getHeight(double[,] hm, int x, int y) {
|
||||||
if (x < 255 && y < 255)
|
if (x < ((int)Constants.RegionSize - 1) && y < ((int)Constants.RegionSize - 1))
|
||||||
return (float)(hm[x, y] * .444 + (hm[x + 1, y] + hm[x, y + 1]) * .222 + hm[x + 1, y +1] * .112);
|
return (float)(hm[x, y] * .444 + (hm[x + 1, y] + hm[x, y + 1]) * .222 + hm[x + 1, y +1] * .112);
|
||||||
else
|
else
|
||||||
return (float)hm[x, y];
|
return (float)hm[x, y];
|
||||||
|
|
|
@ -777,9 +777,9 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
// related to the handling of attachments
|
// related to the handling of attachments
|
||||||
//m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
|
//m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
|
||||||
|
|
||||||
if (pos.X < 0 || pos.X > Constants.RegionSize || pos.Y < 0 || pos.Y > Constants.RegionSize || pos.Z < 0)
|
if (pos.X < 0 || pos.X >= (int)Constants.RegionSize || pos.Y < 0 || pos.Y >= (int)Constants.RegionSize || pos.Z < 0)
|
||||||
{
|
{
|
||||||
Vector3 emergencyPos = new Vector3(128, 128, 128);
|
Vector3 emergencyPos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 128);
|
||||||
|
|
||||||
m_log.WarnFormat(
|
m_log.WarnFormat(
|
||||||
"[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}",
|
"[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}",
|
||||||
|
@ -2948,7 +2948,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
public void Reset()
|
public void Reset()
|
||||||
{
|
{
|
||||||
// Put the child agent back at the center
|
// Put the child agent back at the center
|
||||||
AbsolutePosition = new Vector3(128, 128, 70);
|
AbsolutePosition = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 70);
|
||||||
ResetAnimations();
|
ResetAnimations();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,7 @@ using System;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
using log4net;
|
using log4net;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
using OpenSim.Framework;
|
||||||
|
|
||||||
namespace OpenSim.Region.Framework.Scenes.Scripting
|
namespace OpenSim.Region.Framework.Scenes.Scripting
|
||||||
{
|
{
|
||||||
|
@ -36,7 +37,7 @@ namespace OpenSim.Region.Framework.Scenes.Scripting
|
||||||
{
|
{
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
private Vector3 m_pos = new Vector3(128, 128, 30);
|
private Vector3 m_pos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 30);
|
||||||
|
|
||||||
public string Name
|
public string Name
|
||||||
{
|
{
|
||||||
|
|
|
@ -513,7 +513,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
|
||||||
|
|
||||||
public Vector3 StartPos
|
public Vector3 StartPos
|
||||||
{
|
{
|
||||||
get { return new Vector3(128, 128, 50); }
|
get { return new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 50); }
|
||||||
set { }
|
set { }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
|
||||||
|
|
||||||
// Local constants
|
// Local constants
|
||||||
|
|
||||||
private static readonly Vector3 CenterOfRegion = new Vector3(128, 128, 20);
|
private static readonly Vector3 CenterOfRegion = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 20);
|
||||||
private static readonly char[] CS_SPACE = { ' ' };
|
private static readonly char[] CS_SPACE = { ' ' };
|
||||||
|
|
||||||
private const int WD_INTERVAL = 1000; // base watchdog interval
|
private const int WD_INTERVAL = 1000; // base watchdog interval
|
||||||
|
|
|
@ -45,7 +45,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
|
||||||
private static readonly ILog m_log =
|
private static readonly ILog m_log =
|
||||||
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
private static readonly OpenMetaverse.Vector3 CenterOfRegion = new OpenMetaverse.Vector3(128, 128, 20);
|
private static readonly OpenMetaverse.Vector3 CenterOfRegion = new OpenMetaverse.Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 20);
|
||||||
private const int DEBUG_CHANNEL = 2147483647;
|
private const int DEBUG_CHANNEL = 2147483647;
|
||||||
|
|
||||||
private static int _idk_ = 0;
|
private static int _idk_ = 0;
|
||||||
|
|
|
@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.Scripting.RegionReady
|
||||||
c.Channel = m_channelNotify;
|
c.Channel = m_channelNotify;
|
||||||
c.Message += numScriptsFailed.ToString() + "," + message;
|
c.Message += numScriptsFailed.ToString() + "," + message;
|
||||||
c.Type = ChatTypeEnum.Region;
|
c.Type = ChatTypeEnum.Region;
|
||||||
c.Position = new Vector3(128, 128, 30);
|
c.Position = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 30);
|
||||||
c.Sender = null;
|
c.Sender = null;
|
||||||
c.SenderUUID = UUID.Zero;
|
c.SenderUUID = UUID.Zero;
|
||||||
|
|
||||||
|
|
|
@ -755,8 +755,8 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
|
||||||
position.X = s_tree.AbsolutePosition.X + (float)randX;
|
position.X = s_tree.AbsolutePosition.X + (float)randX;
|
||||||
position.Y = s_tree.AbsolutePosition.Y + (float)randY;
|
position.Y = s_tree.AbsolutePosition.Y + (float)randY;
|
||||||
|
|
||||||
if (position.X <= 255 && position.X >= 0 &&
|
if (position.X <= ((int)Constants.RegionSize - 1) && position.X >= 0 &&
|
||||||
position.Y <= 255 && position.Y >= 0 &&
|
position.Y <= ((int)Constants.RegionSize - 1) && position.Y >= 0 &&
|
||||||
Util.GetDistanceTo(position, copse.m_seed_point) <= copse.m_range)
|
Util.GetDistanceTo(position, copse.m_seed_point) <= copse.m_range)
|
||||||
{
|
{
|
||||||
UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner;
|
UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner;
|
||||||
|
|
|
@ -144,7 +144,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
|
||||||
}
|
}
|
||||||
else if (actor.Position.Y >= Constants.RegionSize)
|
else if (actor.Position.Y >= Constants.RegionSize)
|
||||||
{
|
{
|
||||||
actor.Position.Y = 255.9F;
|
actor.Position.Y = ((int)Constants.RegionSize - 0.1f);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (actor.Position.X < 0)
|
if (actor.Position.X < 0)
|
||||||
|
@ -153,7 +153,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
|
||||||
}
|
}
|
||||||
else if (actor.Position.X >= Constants.RegionSize)
|
else if (actor.Position.X >= Constants.RegionSize)
|
||||||
{
|
{
|
||||||
actor.Position.X = 255.9F;
|
actor.Position.X = ((int)Constants.RegionSize - 0.1f);
|
||||||
}
|
}
|
||||||
|
|
||||||
float height = _heightMap[(int)actor.Position.Y * Constants.RegionSize + (int)actor.Position.X] + actor.Size.Z;
|
float height = _heightMap[(int)actor.Position.Y * Constants.RegionSize + (int)actor.Position.X] + actor.Size.Z;
|
||||||
|
|
|
@ -2476,7 +2476,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
|
||||||
l_orientation.Z = tempOrientation2.getZ();
|
l_orientation.Z = tempOrientation2.getZ();
|
||||||
l_orientation.W = tempOrientation2.getW();
|
l_orientation.W = tempOrientation2.getW();
|
||||||
|
|
||||||
if (l_position.X > 255.95f || l_position.X < 0f || l_position.Y > 255.95f || l_position.Y < 0f)
|
if (l_position.X > ((int)Constants.RegionSize - 0.05f) || l_position.X < 0f || l_position.Y > ((int)Constants.RegionSize - 0.05f) || l_position.Y < 0f)
|
||||||
{
|
{
|
||||||
//base.RaiseOutOfBounds(l_position);
|
//base.RaiseOutOfBounds(l_position);
|
||||||
|
|
||||||
|
|
|
@ -161,7 +161,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_position = new PhysicsVector(128,128,parent_scene.GetTerrainHeightAtXY(128,128) + 10);
|
_position = new PhysicsVector(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), parent_scene.GetTerrainHeightAtXY(128, 128) + 10);
|
||||||
m_taintPosition.X = _position.X;
|
m_taintPosition.X = _position.X;
|
||||||
m_taintPosition.Y = _position.Y;
|
m_taintPosition.Y = _position.Y;
|
||||||
m_taintPosition.Z = _position.Z;
|
m_taintPosition.Z = _position.Z;
|
||||||
|
|
|
@ -181,7 +181,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
||||||
_velocity = new PhysicsVector();
|
_velocity = new PhysicsVector();
|
||||||
if (!PhysicsVector.isFinite(pos))
|
if (!PhysicsVector.isFinite(pos))
|
||||||
{
|
{
|
||||||
pos = new PhysicsVector(128, 128, parent_scene.GetTerrainHeightAtXY(128, 128) + 0.5f);
|
pos = new PhysicsVector(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), parent_scene.GetTerrainHeightAtXY(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f)) + 0.5f);
|
||||||
m_log.Warn("[PHYSICS]: Got nonFinite Object create Position");
|
m_log.Warn("[PHYSICS]: Got nonFinite Object create Position");
|
||||||
}
|
}
|
||||||
_position = pos;
|
_position = pos;
|
||||||
|
@ -2538,7 +2538,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
||||||
l_orientation.Z = ori.Z;
|
l_orientation.Z = ori.Z;
|
||||||
l_orientation.W = ori.W;
|
l_orientation.W = ori.W;
|
||||||
|
|
||||||
if (l_position.X > 255.95f || l_position.X < 0f || l_position.Y > 255.95f || l_position.Y < 0f)
|
if (l_position.X > ((int)Constants.RegionSize - 0.05f) || l_position.X < 0f || l_position.Y > ((int)Constants.RegionSize - 0.05f) || l_position.Y < 0f)
|
||||||
{
|
{
|
||||||
//base.RaiseOutOfBounds(l_position);
|
//base.RaiseOutOfBounds(l_position);
|
||||||
|
|
||||||
|
|
|
@ -76,7 +76,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
||||||
public void CreateAndDropPhysicalCube()
|
public void CreateAndDropPhysicalCube()
|
||||||
{
|
{
|
||||||
PrimitiveBaseShape newcube = PrimitiveBaseShape.CreateBox();
|
PrimitiveBaseShape newcube = PrimitiveBaseShape.CreateBox();
|
||||||
PhysicsVector position = new PhysicsVector(128, 128, 128);
|
PhysicsVector position = new PhysicsVector(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 128);
|
||||||
PhysicsVector size = new PhysicsVector(0.5f, 0.5f, 0.5f);
|
PhysicsVector size = new PhysicsVector(0.5f, 0.5f, 0.5f);
|
||||||
Quaternion rot = Quaternion.Identity;
|
Quaternion rot = Quaternion.Identity;
|
||||||
PhysicsActor prim = ps.AddPrimShape("CoolShape", newcube, position, size, rot, true);
|
PhysicsActor prim = ps.AddPrimShape("CoolShape", newcube, position, size, rot, true);
|
||||||
|
|
|
@ -298,7 +298,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
CheckThreatLevel(ThreatLevel.High, "osTerrainSetHeight");
|
CheckThreatLevel(ThreatLevel.High, "osTerrainSetHeight");
|
||||||
|
|
||||||
m_host.AddScriptLPS(1);
|
m_host.AddScriptLPS(1);
|
||||||
if (x > 255 || x < 0 || y > 255 || y < 0)
|
if (x > ((int)Constants.RegionSize - 1) || x < 0 || y > ((int)Constants.RegionSize - 1) || y < 0)
|
||||||
OSSLError("osTerrainSetHeight: Coordinate out of bounds");
|
OSSLError("osTerrainSetHeight: Coordinate out of bounds");
|
||||||
|
|
||||||
if (World.Permissions.CanTerraformLand(m_host.OwnerID, new Vector3(x, y, 0)))
|
if (World.Permissions.CanTerraformLand(m_host.OwnerID, new Vector3(x, y, 0)))
|
||||||
|
@ -317,7 +317,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
CheckThreatLevel(ThreatLevel.None, "osTerrainGetHeight");
|
CheckThreatLevel(ThreatLevel.None, "osTerrainGetHeight");
|
||||||
|
|
||||||
m_host.AddScriptLPS(1);
|
m_host.AddScriptLPS(1);
|
||||||
if (x > 255 || x < 0 || y > 255 || y < 0)
|
if (x > ((int)Constants.RegionSize - 1) || x < 0 || y > ((int)Constants.RegionSize - 1) || y < 0)
|
||||||
OSSLError("osTerrainGetHeight: Coordinate out of bounds");
|
OSSLError("osTerrainGetHeight: Coordinate out of bounds");
|
||||||
|
|
||||||
return World.Heightmap[x, y];
|
return World.Heightmap[x, y];
|
||||||
|
|
|
@ -31,6 +31,7 @@ using System.Threading;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using OpenSim.Framework;
|
||||||
using OpenSim.Region.Framework.Interfaces;
|
using OpenSim.Region.Framework.Interfaces;
|
||||||
using OpenSim.Region.ScriptEngine.Interfaces;
|
using OpenSim.Region.ScriptEngine.Interfaces;
|
||||||
using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
|
using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
|
||||||
|
@ -443,12 +444,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
}
|
}
|
||||||
private void Save()
|
private void Save()
|
||||||
{
|
{
|
||||||
if (Position.x > 255)
|
if (Position.x > ((int)Constants.RegionSize - 1))
|
||||||
Position.x = 255;
|
Position.x = ((int)Constants.RegionSize - 1);
|
||||||
if (Position.x < 0)
|
if (Position.x < 0)
|
||||||
Position.x = 0;
|
Position.x = 0;
|
||||||
if (Position.y > 255)
|
if (Position.y > ((int)Constants.RegionSize - 1))
|
||||||
Position.y = 255;
|
Position.y = ((int)Constants.RegionSize - 1);
|
||||||
if (Position.y < 0)
|
if (Position.y < 0)
|
||||||
Position.y = 0;
|
Position.y = 0;
|
||||||
if (Position.z > 768)
|
if (Position.z > 768)
|
||||||
|
|
|
@ -32,6 +32,7 @@ using System.Reflection;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using Mono.Data.SqliteClient;
|
using Mono.Data.SqliteClient;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
|
using OpenSim.Framework;
|
||||||
using OpenSim.Region.Framework.Scenes;
|
using OpenSim.Region.Framework.Scenes;
|
||||||
using OpenSim.Framework.Statistics;
|
using OpenSim.Framework.Statistics;
|
||||||
|
|
||||||
|
@ -39,7 +40,7 @@ namespace OpenSim.Region.UserStatistics
|
||||||
{
|
{
|
||||||
public class ActiveConnectionsAJAX : IStatsController
|
public class ActiveConnectionsAJAX : IStatsController
|
||||||
{
|
{
|
||||||
private Vector3 DefaultNeighborPosition = new Vector3(128, 128, 70);
|
private Vector3 DefaultNeighborPosition = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 70);
|
||||||
|
|
||||||
#region IStatsController Members
|
#region IStatsController Members
|
||||||
|
|
||||||
|
|
|
@ -298,7 +298,7 @@ namespace OpenSim.Tests.Common.Mock
|
||||||
/// </value>
|
/// </value>
|
||||||
public string CapsSeedUrl;
|
public string CapsSeedUrl;
|
||||||
|
|
||||||
private Vector3 startPos = new Vector3(128, 128, 2);
|
private Vector3 startPos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 2);
|
||||||
|
|
||||||
public virtual Vector3 StartPos
|
public virtual Vector3 StartPos
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue