aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/EventManager.cs
diff options
context:
space:
mode:
authorBlueWall2012-10-19 07:46:00 -0400
committerBlueWall2012-10-19 07:46:00 -0400
commit276600ab71a44987ede0bef243cd6ae82c08055d (patch)
tree344f486f78b95193353a072152836d882e87ab45 /OpenSim/Region/Framework/Scenes/EventManager.cs
parentMove PluginManager (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-276600ab71a44987ede0bef243cd6ae82c08055d.zip
opensim-SC-276600ab71a44987ede0bef243cd6ae82c08055d.tar.gz
opensim-SC-276600ab71a44987ede0bef243cd6ae82c08055d.tar.bz2
opensim-SC-276600ab71a44987ede0bef243cd6ae82c08055d.tar.xz
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs6
1 files changed, 3 insertions, 3 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 {