ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

object CanMove is for in scene SOGs Icleints and SPs and permitions module is NOT a shared module

Browse Source
This commit is contained in:
UbitUmarov
2017-01-19 12:35:00 +00:00
parent fe9a785ecc
commit 673bd37219
5 changed files with 57 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
View File

@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes
public delegate bool DuplicateObjectHandler(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition);
public delegate bool EditObjectHandler(UUID objectID, UUID editorID, Scene scene);
public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene);
public delegate bool MoveObjectHandler(UUID objectID, UUID moverID, Scene scene);
public delegate bool MoveObjectHandler(SceneObjectGroup sog, ScenePresence sp);
public delegate bool ObjectEntryHandler(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene);
public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene);
public delegate bool InstantMessageHandler(UUID user, UUID target, Scene startScene);
@@ -450,15 +450,22 @@ namespace OpenSim.Region.Framework.Scenes
#endregion
#region MOVE OBJECT
public bool CanMoveObject(UUID objectID, UUID moverID)
public bool CanMoveObject(SceneObjectGroup sog, IClientAPI client)
{
if(sog == null || client == null)
return false;
ScenePresence sp = client.SceneAgent as ScenePresence;
if(sp == null)
return false;
MoveObjectHandler handler = OnMoveObject;
if (handler != null)
{
Delegate[] list = handler.GetInvocationList();
foreach (MoveObjectHandler h in list)
{
if (h(objectID, moverID, m_scene) == false)
if (h(sog, sp) == false)
return false;
}
}