OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add userExposed parameter to part copy event

prebuild-update
Justin Clark-Casey (justincc) 2010-07-28 19:38:20 +01:00
parent 0f15ccb2cf
commit f067f733ea
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
View File

@ -266,7 +266,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
} }
} }
protected void OnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original) protected void OnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed)
{ {
if (original.Shape.Media != null) if (original.Shape.Media != null)
{ {

9
OpenSim/Region/Framework/Scenes/EventManager.cs
View File

@ -354,8 +354,11 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary> /// <summary>
/// Called when a scene object part is cloned within the region. /// Called when a scene object part is cloned within the region.
/// </summary> /// </summary>
/// <param name="copy"></param>
/// <param name="original"></param>
/// <param name="userExposed">True if the duplicate will immediately be in the scene, false otherwise</param>
public event SceneObjectPartCopyDelegate OnSceneObjectPartCopy; public event SceneObjectPartCopyDelegate OnSceneObjectPartCopy;
public delegate void SceneObjectPartCopyDelegate(SceneObjectPart copy, SceneObjectPart original); public delegate void SceneObjectPartCopyDelegate(SceneObjectPart copy, SceneObjectPart original, bool userExposed);
public delegate void RegionUp(GridRegion region); public delegate void RegionUp(GridRegion region);
public event RegionUp OnRegionUp; public event RegionUp OnRegionUp;
@ -2081,7 +2084,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
public void TriggerOnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original) public void TriggerOnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed)
{ {
SceneObjectPartCopyDelegate handler = OnSceneObjectPartCopy; SceneObjectPartCopyDelegate handler = OnSceneObjectPartCopy;
if (handler != null) if (handler != null)
@ -2090,7 +2093,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
try try
{ {
d(copy, original); d(copy, original, userExposed);
} }
catch (Exception e) catch (Exception e)
{ {

1
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1528,6 +1528,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary> /// <summary>
/// Duplicates this object, including operations such as physics set up and attaching to the backup event. /// Duplicates this object, including operations such as physics set up and attaching to the backup event.
/// </summary> /// </summary>
/// <param name="userExposed">True if the duplicate will immediately be in the scene, false otherwise</param>
/// <returns></returns> /// <returns></returns>
public SceneObjectGroup Copy(bool userExposed) public SceneObjectGroup Copy(bool userExposed)
{ {

7
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -1554,6 +1554,11 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary> /// <summary>
/// Duplicates this part. /// Duplicates this part.
/// </summary> /// </summary>
/// <param name="localID"></param>
/// <param name="AgentID"></param>
/// <param name="GroupID"></param>
/// <param name="linkNum"></param>
/// <param name="userExposed">True if the duplicate will immediately be in the scene, false otherwise</param>
/// <returns></returns> /// <returns></returns>
public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed) public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed)
{ {
@ -1617,7 +1622,7 @@ namespace OpenSim.Region.Framework.Scenes
dupe.DoPhysicsPropertyUpdate(UsePhysics, true); dupe.DoPhysicsPropertyUpdate(UsePhysics, true);
} }
ParentGroup.Scene.EventManager.TriggerOnSceneObjectPartCopy(dupe, this); ParentGroup.Scene.EventManager.TriggerOnSceneObjectPartCopy(dupe, this, userExposed);
// m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID); // m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID);