From 797def8aa4a009ba3bc44d6b73e063e4bb61ba97 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Aug 2011 04:33:45 +0100
Subject: Put config to enable disable [NPC] module.

Default is disabled.  You will need to explicitly enable to toy with this.
---
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/World')

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index fcfacc6..d139b25 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -44,15 +44,18 @@ namespace OpenSim.Region.OptionalModules.World.NPC
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        // private const bool m_enabled = false;
-
         private Dictionary<UUID, NPCAvatar> m_avatars = new Dictionary<UUID, NPCAvatar>();
         private Dictionary<UUID, AvatarAppearance> m_appearanceCache = new Dictionary<UUID, AvatarAppearance>();
 
         public void Initialise(Scene scene, IConfigSource source)
         {
-            scene.RegisterModuleInterface<INPCModule>(this);
-            scene.EventManager.OnSignificantClientMovement += HandleOnSignificantClientMovement;
+            IConfig config = source.Configs["NPC"];
+
+            if (config != null && config.GetBoolean("Enabled", false))
+            {
+                scene.RegisterModuleInterface<INPCModule>(this);
+                scene.EventManager.OnSignificantClientMovement += HandleOnSignificantClientMovement;
+            }
         }
 
         public void HandleOnSignificantClientMovement(ScenePresence presence)
-- 
cgit v1.1