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

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).

afrisby
MW 2007-08-24 12:34:00 +00:00
parent c296ad684b
commit d79b0ba269
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Environment/LandManagement/LandManager.cs
View File

@ -207,7 +207,8 @@ namespace OpenSim.Region.Environment.LandManagement
if (x > 63 || y > 63 || x < 0 || y < 0) 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 else
{ {
@ -220,7 +221,8 @@ namespace OpenSim.Region.Environment.LandManagement
{ {
if (x > 256 || y > 256 || x < 0 || y < 0) 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 else
{ {

21
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -83,11 +83,30 @@ namespace OpenSim.Region.Environment.Scenes
get { return m_rootPart.GroupPosition; } get { return m_rootPart.GroupPosition; }
set 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) lock (this.m_parts)
{ {
foreach (SceneObjectPart part in this.m_parts.Values) foreach (SceneObjectPart part in this.m_parts.Values)
{ {
part.GroupPosition = value; part.GroupPosition = val;
} }
} }
if (m_rootPart.PhysActor != null) if (m_rootPart.PhysActor != null)