From 691c4bc756b9565e648ff8ad88cfbfabd1b0be76 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 22 Nov 2008 00:23:48 +0000
Subject: Mantis #2442 Attempt to reinstate the Object Entry flag in parcel
 settings

---
 OpenSim/Region/Environment/Scenes/Scene.Permissions.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.Permissions.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Permissions.cs b/OpenSim/Region/Environment/Scenes/Scene.Permissions.cs
index 3a5a3d1..5f3b100 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Permissions.cs
@@ -403,7 +403,7 @@ namespace OpenSim.Region.Environment.Scenes
         #endregion
 
         #region OBJECT ENTRY
-        public delegate bool CanObjectEntryHandler(UUID objectID, Vector3 newPoint, Scene scene);
+        public delegate bool CanObjectEntryHandler(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene);
         private List<CanObjectEntryHandler> CanObjectEntryCheckFunctions = new List<CanObjectEntryHandler>();
 
         public void AddObjectEntryHandler(CanObjectEntryHandler delegateFunc)
@@ -418,11 +418,11 @@ namespace OpenSim.Region.Environment.Scenes
                 CanObjectEntryCheckFunctions.Remove(delegateFunc);
         }
 
-        public bool CanObjectEntry(UUID objectID, Vector3 newPoint)
+        public bool CanObjectEntry(UUID objectID, bool enteringRegion, Vector3 newPoint)
         {
             foreach (CanObjectEntryHandler check in CanObjectEntryCheckFunctions)
             {
-                if (check(objectID, newPoint, m_scene) == false)
+                if (check(objectID, enteringRegion, newPoint, m_scene) == false)
                 {
                     return false;
                 }
-- 
cgit v1.1