aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-01-12 01:11:05 +0100
committerMelanie2012-01-12 01:11:05 +0100
commit5d9e135b5cdf23325448c14086e1a40d0ea6f948 (patch)
tree7e95a9d2eb2cc047eb456d0f100349cd9156fa6f /OpenSim/Region
parentAdapt a cast to using the new TeleportFlags (diff)
downloadopensim-SC-5d9e135b5cdf23325448c14086e1a40d0ea6f948.zip
opensim-SC-5d9e135b5cdf23325448c14086e1a40d0ea6f948.tar.gz
opensim-SC-5d9e135b5cdf23325448c14086e1a40d0ea6f948.tar.bz2
opensim-SC-5d9e135b5cdf23325448c14086e1a40d0ea6f948.tar.xz
Remove ViewObjectInventory method unsupported by core
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Permissions.cs17
1 files changed, 0 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 48beb9c..e1fedf4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -49,7 +49,6 @@ namespace OpenSim.Region.Framework.Scenes
49 public delegate bool DuplicateObjectHandler(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition); 49 public delegate bool DuplicateObjectHandler(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition);
50 public delegate bool EditObjectHandler(UUID objectID, UUID editorID, Scene scene); 50 public delegate bool EditObjectHandler(UUID objectID, UUID editorID, Scene scene);
51 public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene); 51 public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene);
52 public delegate bool ViewObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene);
53 public delegate bool MoveObjectHandler(UUID objectID, UUID moverID, Scene scene); 52 public delegate bool MoveObjectHandler(UUID objectID, UUID moverID, Scene scene);
54 public delegate bool ObjectEntryHandler(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene); 53 public delegate bool ObjectEntryHandler(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene);
55 public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene); 54 public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene);
@@ -117,7 +116,6 @@ namespace OpenSim.Region.Framework.Scenes
117 public event DuplicateObjectHandler OnDuplicateObject; 116 public event DuplicateObjectHandler OnDuplicateObject;
118 public event EditObjectHandler OnEditObject; 117 public event EditObjectHandler OnEditObject;
119 public event EditObjectInventoryHandler OnEditObjectInventory; 118 public event EditObjectInventoryHandler OnEditObjectInventory;
120 public event ViewObjectInventoryHandler OnViewObjectInventory;
121 public event MoveObjectHandler OnMoveObject; 119 public event MoveObjectHandler OnMoveObject;
122 public event ObjectEntryHandler OnObjectEntry; 120 public event ObjectEntryHandler OnObjectEntry;
123 public event ReturnObjectsHandler OnReturnObjects; 121 public event ReturnObjectsHandler OnReturnObjects;
@@ -403,21 +401,6 @@ namespace OpenSim.Region.Framework.Scenes
403 return true; 401 return true;
404 } 402 }
405 403
406 public bool CanViewObjectInventory(UUID objectID, UUID editorID)
407 {
408 ViewObjectInventoryHandler handler = OnViewObjectInventory;
409 if (handler != null)
410 {
411 Delegate[] list = handler.GetInvocationList();
412 foreach (ViewObjectInventoryHandler h in list)
413 {
414 if (h(objectID, editorID, m_scene) == false)
415 return false;
416 }
417 }
418 return true;
419 }
420
421 #endregion 404 #endregion
422 405
423 #region MOVE OBJECT 406 #region MOVE OBJECT