Hopefully fixed mantis bug #318 (exception when a prim moves across a border, for now have stopped prims moving beyond a regions area, will add sending prims from one region to another soon).
parent
c296ad684b
commit
d79b0ba269
|
@ -207,7 +207,8 @@ namespace OpenSim.Region.Environment.LandManagement
|
|||
|
||||
if (x > 63 || y > 63 || x < 0 || y < 0)
|
||||
{
|
||||
throw new Exception("Error: Parcel not found at point " + x + ", " + y);
|
||||
return null;
|
||||
//throw new Exception("Error: Parcel not found at point " + x + ", " + y);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -220,7 +221,8 @@ namespace OpenSim.Region.Environment.LandManagement
|
|||
{
|
||||
if (x > 256 || y > 256 || x < 0 || y < 0)
|
||||
{
|
||||
throw new Exception("Error: Parcel not found at point " + x + ", " + y);
|
||||
return null;
|
||||
//throw new Exception("Error: Parcel not found at point " + x + ", " + y);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -83,11 +83,30 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
get { return m_rootPart.GroupPosition; }
|
||||
set
|
||||
{
|
||||
LLVector3 val = value;
|
||||
if (val.X > 255.6f)
|
||||
{
|
||||
val.X = 255.6f;
|
||||
}
|
||||
else if (val.X < 0.4f)
|
||||
{
|
||||
val.X = 0.4f;
|
||||
}
|
||||
|
||||
if (val.Y > 255.6f)
|
||||
{
|
||||
val.Y = 255.6f;
|
||||
}
|
||||
else if (val.Y < 0.4f)
|
||||
{
|
||||
val.Y = 0.4f;
|
||||
}
|
||||
|
||||
lock (this.m_parts)
|
||||
{
|
||||
foreach (SceneObjectPart part in this.m_parts.Values)
|
||||
{
|
||||
part.GroupPosition = value;
|
||||
part.GroupPosition = val;
|
||||
}
|
||||
}
|
||||
if (m_rootPart.PhysActor != null)
|
||||
|
|
Loading…
Reference in New Issue