aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorOren Hurvitz2013-01-22 12:17:16 +0200
committerJustin Clark-Casey (justincc)2013-01-25 04:03:28 +0000
commit23f0610f0ce33a7308fc2c9190204b2d8882ce85 (patch)
treed1b1ddc23e5c56c1a587a70c7877e1bab6867c4b /OpenSim/Region
parentAdded DynAttrs to the serialized XML format of prims. When copying prims, use... (diff)
downloadopensim-SC_OLD-23f0610f0ce33a7308fc2c9190204b2d8882ce85.zip
opensim-SC_OLD-23f0610f0ce33a7308fc2c9190204b2d8882ce85.tar.gz
opensim-SC_OLD-23f0610f0ce33a7308fc2c9190204b2d8882ce85.tar.bz2
opensim-SC_OLD-23f0610f0ce33a7308fc2c9190204b2d8882ce85.tar.xz
Disabled DAExampleModule
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs18
1 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
index 084fb5f..d36f65a 100644
--- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
@@ -45,7 +45,9 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DAExampleModule
45 public class DAExampleModule : INonSharedRegionModule 45 public class DAExampleModule : INonSharedRegionModule
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 private static readonly bool ENABLED = false; // enable for testing
50
49 protected Scene m_scene; 51 protected Scene m_scene;
50 protected IDialogModule m_dialogMod; 52 protected IDialogModule m_dialogMod;
51 53
@@ -56,14 +58,20 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DAExampleModule
56 58
57 public void AddRegion(Scene scene) 59 public void AddRegion(Scene scene)
58 { 60 {
59 m_scene = scene; 61 if (ENABLED)
60 m_scene.EventManager.OnSceneGroupMove += OnSceneGroupMove; 62 {
61 m_dialogMod = m_scene.RequestModuleInterface<IDialogModule>(); 63 m_scene = scene;
64 m_scene.EventManager.OnSceneGroupMove += OnSceneGroupMove;
65 m_dialogMod = m_scene.RequestModuleInterface<IDialogModule>();
66 }
62 } 67 }
63 68
64 public void RemoveRegion(Scene scene) 69 public void RemoveRegion(Scene scene)
65 { 70 {
66 m_scene.EventManager.OnSceneGroupMove -= OnSceneGroupMove; 71 if (ENABLED)
72 {
73 m_scene.EventManager.OnSceneGroupMove -= OnSceneGroupMove;
74 }
67 } 75 }
68 76
69 public void RegionLoaded(Scene scene) {} 77 public void RegionLoaded(Scene scene) {}