ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

Browse Source
This commit is contained in:
Melanie
2012-03-07 00:51:24 +00:00
parent 5004d0ad09 0be4ed3df4
commit f3e04beb2e
10 changed files with 877 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
View File

@@ -121,12 +121,18 @@ namespace OpenSim.Region.OptionalModules
private bool CanObjectEnter(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene)
{
if ((newPoint.X > 257f || newPoint.X < -1f || newPoint.Y > 257f || newPoint.Y < -1f))
return true;
SceneObjectPart obj = scene.GetSceneObjectPart(objectID);
Vector3 oldPoint = obj.GroupPosition;
int objectCount = obj.ParentGroup.PrimCount;
ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
ILandObject newParcel = scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y);
if (newParcel == null)
return true;
int usedPrims = newParcel.PrimCounts.Total;
int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount();
@@ -171,4 +177,4 @@ namespace OpenSim.Region.OptionalModules
return true;
}
}
}
}