aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDan Lake2012-02-02 18:19:22 -0800
committerDan Lake2012-02-02 18:19:22 -0800
commit61adf36339f15fcbcc16d96ff7089f03edf72c10 (patch)
treedf2da981c6ae58317fc842ea1b12124c27c3dd84 /OpenSim
parentOpenSim tests do not always create an EventManager so calls to trigger events... (diff)
downloadopensim-SC_OLD-61adf36339f15fcbcc16d96ff7089f03edf72c10.zip
opensim-SC_OLD-61adf36339f15fcbcc16d96ff7089f03edf72c10.tar.gz
opensim-SC_OLD-61adf36339f15fcbcc16d96ff7089f03edf72c10.tar.bz2
opensim-SC_OLD-61adf36339f15fcbcc16d96ff7089f03edf72c10.tar.xz
Commenting out new event until I can fix OpenSim tests. Currently, testing objects does not create a Scene or EventManager so triggering events crashes some tests
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 9fb11d3..27bcc09 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2729,9 +2729,9 @@ namespace OpenSim.Region.Framework.Scenes
2729 if (ParentGroup == null) 2729 if (ParentGroup == null)
2730 return; 2730 return;
2731 2731
2732 // When running OpenSim tests, EventManager can be null. Maybe tests should create an EventManager. 2732 // When running OpenSim tests, Scene (and EventManager can be null).
2733 if(ParentGroup.Scene.EventManager != null) 2733 // Need to fix tests before we can trigger this here
2734 ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this); 2734 // ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this);
2735 2735
2736 ParentGroup.QueueForUpdateCheck(); 2736 ParentGroup.QueueForUpdateCheck();
2737 2737
@@ -2765,9 +2765,9 @@ namespace OpenSim.Region.Framework.Scenes
2765 if (ParentGroup == null) 2765 if (ParentGroup == null)
2766 return; 2766 return;
2767 2767
2768 // When running OpenSim tests, EventManager can be null. Maybe tests should create an EventManager. 2768 // When running OpenSim tests, Scene (and EventManager can be null).
2769 if (ParentGroup.Scene.EventManager != null) 2769 // Need to fix tests before we can trigger this here
2770 ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this); 2770 // ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this);
2771 2771
2772 // This was pulled from SceneViewer. Attachments always receive full updates. 2772 // This was pulled from SceneViewer. Attachments always receive full updates.
2773 // I could not verify if this is a requirement but this maintains existing behavior 2773 // I could not verify if this is a requirement but this maintains existing behavior