diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index e25fa94..a8ff218 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -913,7 +913,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
913 | public event SceneObjectPartCopyDelegate OnSceneObjectPartCopy; | 913 | public event SceneObjectPartCopyDelegate OnSceneObjectPartCopy; |
914 | public delegate void SceneObjectPartCopyDelegate(SceneObjectPart copy, SceneObjectPart original, bool userExposed); | 914 | public delegate void SceneObjectPartCopyDelegate(SceneObjectPart copy, SceneObjectPart original, bool userExposed); |
915 | 915 | ||
916 | public delegate void SceneObjectPartUpdated(SceneObjectPart sop); | 916 | public delegate void SceneObjectPartUpdated(SceneObjectPart sop, bool full); |
917 | public event SceneObjectPartUpdated OnSceneObjectPartUpdated; | 917 | public event SceneObjectPartUpdated OnSceneObjectPartUpdated; |
918 | 918 | ||
919 | public delegate void ScenePresenceUpdated(ScenePresence sp); | 919 | public delegate void ScenePresenceUpdated(ScenePresence sp); |
@@ -2837,7 +2837,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2837 | } | 2837 | } |
2838 | } | 2838 | } |
2839 | 2839 | ||
2840 | public void TriggerSceneObjectPartUpdated(SceneObjectPart sop) | 2840 | public void TriggerSceneObjectPartUpdated(SceneObjectPart sop, bool full) |
2841 | { | 2841 | { |
2842 | SceneObjectPartUpdated handler = OnSceneObjectPartUpdated; | 2842 | SceneObjectPartUpdated handler = OnSceneObjectPartUpdated; |
2843 | if (handler != null) | 2843 | if (handler != null) |
@@ -2846,7 +2846,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2846 | { | 2846 | { |
2847 | try | 2847 | try |
2848 | { | 2848 | { |
2849 | d(sop); | 2849 | d(sop, full); |
2850 | } | 2850 | } |
2851 | catch (Exception e) | 2851 | catch (Exception e) |
2852 | { | 2852 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e6b8c16..671feda 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2139,7 +2139,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
2139 | public bool AddRestoredSceneObject( | 2139 | public bool AddRestoredSceneObject( |
2140 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) | 2140 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) |
2141 | { | 2141 | { |
2142 | return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates); | 2142 | if (m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates)) |
2143 | { | ||
2144 | EventManager.TriggerObjectAddedToScene(sceneObject); | ||
2145 | return true; | ||
2146 | } | ||
2147 | |||
2148 | return false; | ||
2149 | |||
2143 | } | 2150 | } |
2144 | 2151 | ||
2145 | /// <summary> | 2152 | /// <summary> |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 3f10b34..199526e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2465,7 +2465,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2465 | // UUID, Name, TimeStampFull); | 2465 | // UUID, Name, TimeStampFull); |
2466 | 2466 | ||
2467 | if (ParentGroup.Scene != null) | 2467 | if (ParentGroup.Scene != null) |
2468 | ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this); | 2468 | ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this, true); |
2469 | } | 2469 | } |
2470 | 2470 | ||
2471 | /// <summary> | 2471 | /// <summary> |
@@ -2499,7 +2499,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2499 | } | 2499 | } |
2500 | 2500 | ||
2501 | if (ParentGroup.Scene != null) | 2501 | if (ParentGroup.Scene != null) |
2502 | ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this); | 2502 | ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this, false); |
2503 | } | 2503 | } |
2504 | 2504 | ||
2505 | public void ScriptSetPhysicsStatus(bool UsePhysics) | 2505 | public void ScriptSetPhysicsStatus(bool UsePhysics) |