small change to OnSceneGroupMove event (in SceneEvents.cs)
parent
6e22faf73e
commit
c1d66a8564
|
@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
|
||||
public event RemoveScript OnRemoveScript;
|
||||
|
||||
public delegate void SceneGroupMoved(LLUUID groupID, LLVector3 delta);
|
||||
public delegate bool SceneGroupMoved(LLUUID groupID, LLVector3 delta);
|
||||
|
||||
public event SceneGroupMoved OnSceneGroupMove;
|
||||
|
||||
|
@ -194,12 +194,13 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
}
|
||||
}
|
||||
|
||||
public void TriggerGroupMove(LLUUID groupID, LLVector3 delta)
|
||||
public bool TriggerGroupMove(LLUUID groupID, LLVector3 delta)
|
||||
{
|
||||
if (OnSceneGroupMove != null)
|
||||
{
|
||||
OnSceneGroupMove(groupID, delta);
|
||||
return OnSceneGroupMove(groupID, delta);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public void TriggerGroupGrab(LLUUID groupID, LLVector3 offset, LLUUID userID)
|
||||
|
|
|
@ -971,10 +971,12 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
/// <param name="pos"></param>
|
||||
/// <param name="remoteClient"></param>
|
||||
public void GrabMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
|
||||
{
|
||||
if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
|
||||
{
|
||||
AbsolutePosition = pos;
|
||||
m_rootPart.SendTerseUpdateToAllClients();
|
||||
m_scene.EventManager.TriggerGroupMove(UUID, pos);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -1262,11 +1264,12 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
/// </summary>
|
||||
/// <param name="pos"></param>
|
||||
public void UpdateGroupPosition(LLVector3 pos)
|
||||
{
|
||||
if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
|
||||
{
|
||||
AbsolutePosition = pos;
|
||||
ScheduleGroupForTerseUpdate();
|
||||
|
||||
m_scene.EventManager.TriggerGroupMove(UUID, pos);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
Loading…
Reference in New Issue