aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-01-20 14:26:24 +0000
committerUbitUmarov2017-01-20 14:26:24 +0000
commitdac32c4e5acd76a3b42dede1c573dbef1a98c7e1 (patch)
treee438948fdf10696c2dc98632c18849a76828fe00 /OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
parentremove redundant IsGod, rename some GOD as Administrator (both only on permis... (diff)
downloadopensim-SC-dac32c4e5acd76a3b42dede1c573dbef1a98c7e1.zip
opensim-SC-dac32c4e5acd76a3b42dede1c573dbef1a98c7e1.tar.gz
opensim-SC-dac32c4e5acd76a3b42dede1c573dbef1a98c7e1.tar.bz2
opensim-SC-dac32c4e5acd76a3b42dede1c573dbef1a98c7e1.tar.xz
change CanObjectEntry() to use a SOG
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Permissions.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Permissions.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 9845418..6925b6c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Framework.Scenes
52 public delegate bool EditObjectHandler(SceneObjectGroup sog, ScenePresence sp); 52 public delegate bool EditObjectHandler(SceneObjectGroup sog, ScenePresence sp);
53 public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene); 53 public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene);
54 public delegate bool MoveObjectHandler(SceneObjectGroup sog, ScenePresence sp); 54 public delegate bool MoveObjectHandler(SceneObjectGroup sog, ScenePresence sp);
55 public delegate bool ObjectEntryHandler(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene); 55 public delegate bool ObjectEntryHandler(SceneObjectGroup sog, bool enteringRegion, Vector3 newPoint, Scene scene);
56 public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene); 56 public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene);
57 public delegate bool InstantMessageHandler(UUID user, UUID target, Scene startScene); 57 public delegate bool InstantMessageHandler(UUID user, UUID target, Scene startScene);
58 public delegate bool InventoryTransferHandler(UUID user, UUID target, Scene startScene); 58 public delegate bool InventoryTransferHandler(UUID user, UUID target, Scene startScene);
@@ -504,7 +504,7 @@ namespace OpenSim.Region.Framework.Scenes
504 #endregion 504 #endregion
505 505
506 #region OBJECT ENTRY 506 #region OBJECT ENTRY
507 public bool CanObjectEntry(UUID objectID, bool enteringRegion, Vector3 newPoint) 507 public bool CanObjectEntry(SceneObjectGroup sog, bool enteringRegion, Vector3 newPoint)
508 { 508 {
509 ObjectEntryHandler handler = OnObjectEntry; 509 ObjectEntryHandler handler = OnObjectEntry;
510 if (handler != null) 510 if (handler != null)
@@ -512,7 +512,7 @@ namespace OpenSim.Region.Framework.Scenes
512 Delegate[] list = handler.GetInvocationList(); 512 Delegate[] list = handler.GetInvocationList();
513 foreach (ObjectEntryHandler h in list) 513 foreach (ObjectEntryHandler h in list)
514 { 514 {
515 if (h(objectID, enteringRegion, newPoint, m_scene) == false) 515 if (h(sog, enteringRegion, newPoint, m_scene) == false)
516 return false; 516 return false;
517 } 517 }
518 } 518 }