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

Mantis #2442

Browse Source 
Attempt to reinstate the Object Entry flag in parcel settings
This commit is contained in:
Melanie Thielker
2008-11-22 00:23:48 +00:00
parent 48cf76efe7
commit 691c4bc756
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@@ -936,7 +936,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
return permission;
}
private bool CanObjectEntry(UUID objectID, Vector3 newPoint, Scene scene)
private bool CanObjectEntry(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene)
{
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -946,8 +946,18 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
return true;
}
SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
ILandObject land = m_scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y);
if(!enteringRegion)
{
ILandObject fromland = m_scene.LandChannel.GetLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y);
if (fromland == land) // Not entering
return true;
}
if (land == null)
{
return false;
@@ -971,7 +981,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
return false;
}
SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
if (GenericParcelPermission(task.OwnerID, newPoint))
{