1 files changed, 140 insertions, 8 deletions

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 8c9717c..b3bfe07 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -25,26 +25,158 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Collections.Generic;
+using System.Threading;
 using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.CoreModules.Avatar.NPC;
+using OpenSim.Framework;
+using Timer=System.Timers.Timer;
 
 namespace OpenSim.Region.OptionalModules.World.NPC
 {
-    public class NPCModule : IRegionModule
+    public class NPCModule : IRegionModule, INPCModule
     {
         // private const bool m_enabled = false;
 
+        private Mutex m_createMutex = new Mutex(false);
+
+        private Timer m_timer = new Timer(500);
+
+        private Dictionary<UUID,NPCAvatar> m_avatars = new Dictionary<UUID, NPCAvatar>();
+
+        private Dictionary<UUID,AvatarAppearance> m_appearanceCache = new Dictionary<UUID, AvatarAppearance>();
+
+        // Timer vars.
+        private bool p_inUse = false;
+        private readonly object p_lock = new object();
+        // Private Temporary Variables.
+        private string p_firstname;
+        private string p_lastname;
+        private Vector3 p_position;
+        private Scene p_scene;
+        private UUID p_cloneAppearanceFrom;
+        private UUID p_returnUuid;
+
+        private AvatarAppearance GetAppearance(UUID target, Scene scene)
+        {
+            if (m_appearanceCache.ContainsKey(target))
+                return m_appearanceCache[target];
+
+            AvatarAppearance x = scene.CommsManager.AvatarService.GetUserAppearance(target);
+
+            m_appearanceCache.Add(target, x);
+
+            return x;
+        }
+
+        public UUID CreateNPC(string firstname, string lastname,Vector3 position, Scene scene, UUID cloneAppearanceFrom)
+        {
+            // Block.
+            m_createMutex.WaitOne();
+
+            // Copy Temp Variables for Timer to pick up.
+            lock (p_lock)
+            {
+                p_firstname = firstname;
+                p_lastname = lastname;
+                p_position = position;
+                p_scene = scene;
+                p_cloneAppearanceFrom = cloneAppearanceFrom;
+                p_inUse = true;
+                p_returnUuid = UUID.Zero;
+            }
+
+            while (p_returnUuid == UUID.Zero)
+            {
+                Thread.Sleep(250);
+            }
+
+            m_createMutex.ReleaseMutex();
+
+            return p_returnUuid;
+        }
+
+        public void Autopilot(UUID agentID, Scene scene, Vector3 pos)
+        {
+            lock (m_avatars)
+            {
+                if (m_avatars.ContainsKey(agentID))
+                {
+                    ScenePresence sp;
+                    scene.TryGetAvatar(agentID, out sp);
+                    sp.DoAutoPilot(0, pos, m_avatars[agentID]);
+                }
+            }
+        }
+
+        public void Say(UUID agentID, Scene scene, string text)
+        {
+            lock (m_avatars)
+            {
+                if (m_avatars.ContainsKey(agentID))
+                {
+                    m_avatars[agentID].Say(text);
+                }
+            }
+        }
+
+        public void DeleteNPC(UUID agentID, Scene scene)
+        {
+            lock (m_avatars)
+            {
+                if (m_avatars.ContainsKey(agentID))
+                {
+                    scene.RemoveClient(agentID);
+                    m_avatars.Remove(agentID);
+                }
+            }
+        }
+
+
         public void Initialise(Scene scene, IConfigSource source)
         {
-            // if (m_enabled)
-            // {
-            //     NPCAvatar testAvatar = new NPCAvatar("Jack", "NPC", new Vector3(128, 128, 40), scene);
-            //     NPCAvatar testAvatar2 = new NPCAvatar("Jill", "NPC", new Vector3(136, 128, 40), scene);
-            //     scene.AddNewClient(testAvatar);
-            //     scene.AddNewClient(testAvatar2);
-            // }
+            scene.RegisterModuleInterface<INPCModule>(this);
+
+            m_timer.Elapsed += m_timer_Elapsed;
+            m_timer.Start();
+        }
+
+        void m_timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            lock (p_lock)
+            {
+                if (p_inUse)
+                {
+                    p_inUse = false;
+
+                    NPCAvatar npcAvatar = new NPCAvatar(p_firstname, p_lastname, p_position, p_scene);
+                    npcAvatar.CircuitCode = (uint) Util.RandomClass.Next(0, int.MaxValue);
+
+                    p_scene.ClientManager.Add(npcAvatar.CircuitCode, npcAvatar);
+                    p_scene.AddNewClient(npcAvatar);
+
+                    ScenePresence sp;
+                    if (p_scene.TryGetAvatar(npcAvatar.AgentId, out sp))
+                    {
+                        AvatarAppearance x = GetAppearance(p_cloneAppearanceFrom, p_scene);
+
+                        List<byte> wearbyte = new List<byte>();
+                        for (int i = 0; i < x.VisualParams.Length; i++)
+                        {
+                            wearbyte.Add(x.VisualParams[i]);
+                        }
+
+                        sp.SetAppearance(x.Texture.GetBytes(), wearbyte);
+                    }
+
+                    m_avatars.Add(npcAvatar.AgentId, npcAvatar);
+
+                    p_returnUuid = npcAvatar.AgentId;
+                }
+            }
         }
 
         public void PostInitialise()