1 files changed, 114 insertions, 57 deletions

diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs
index 5d4af31..a8b2426 100644
--- a/OpenSim/Tools/pCampBot/PhysicsBot.cs
+++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs
@@ -29,56 +29,85 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
+using System.Reflection;
 using System.Threading;
 using System.Timers;
+using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Assets;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using Timer=System.Timers.Timer;
+using Timer = System.Timers.Timer;
 
 namespace pCampBot
 {
     public class PhysicsBot
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         public delegate void AnEvent(PhysicsBot callbot, EventType someevent); // event delegate for bot events
-        public IConfig startupConfig; // bot config, passed from BotManager
 
-        public string firstname;
-        public string lastname;
-        public string password;
-        public string loginURI;
+        public BotManager BotManager { get; private set; }
+        private IConfig startupConfig; // bot config, passed from BotManager
+
+        /// <summary>
+        /// Is this bot connected to the grid?
+        /// </summary>
+        public bool IsConnected { get; private set; }
+
+        public string FirstName { get; private set; }
+        public string LastName { get; private set; }
+        public string Name { get; private set; }
+        public string Password { get; private set; }
+        public string LoginUri { get; private set; }
         public string saveDir;
         public string wear;
 
         public event AnEvent OnConnected;
         public event AnEvent OnDisconnected;
 
-        protected Timer m_action; // Action Timer
+        /// <summary>
+        /// Keep a track of the continuously acting thread so that we can abort it.
+        /// </summary>
+        private Thread m_actionThread;
+
         protected List<uint> objectIDs = new List<uint>();
 
         protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here
 
-        //New instance of a SecondLife client
+        /// <summary>
+        /// New instance of a SecondLife client
+        /// </summary>
         public GridClient client = new GridClient();
 
         protected string[] talkarray;
+
         /// <summary>
-        ///
+        /// Constructor
         /// </summary>
-        /// <param name="bsconfig">nini config for the bot</param>
-        public PhysicsBot(IConfig bsconfig)
+        /// <param name="bm"></param>
+        /// <param name="firstName"></param>
+        /// <param name="lastName"></param>
+        /// <param name="password"></param>
+        /// <param name="loginUri"></param>
+        public PhysicsBot(BotManager bm, string firstName, string lastName, string password, string loginUri)
         {
-            startupConfig = bsconfig;
+            FirstName = firstName;
+            LastName = lastName;
+            Name = string.Format("{0} {1}", FirstName, LastName);
+            Password = password;
+            LoginUri = loginUri;
+
+            BotManager = bm;
+            startupConfig = bm.Config;
             readconfig();
             talkarray = readexcuses();
         }
 
         //We do our actions here.  This is where one would
         //add additional steps and/or things the bot should do
-
-        void m_action_Elapsed(object sender, ElapsedEventArgs e)
+        private void Action()
         {
             while (true)
             {
@@ -95,11 +124,11 @@ namespace pCampBot
                 }
 
                 // TODO: unused: Vector3 pos = client.Self.SimPosition;
-                Vector3 newpos = new Vector3(somthing.Next(255), somthing.Next(255), somthing.Next(255));
+                Vector3 newpos = new Vector3(somthing.Next(1, 254), somthing.Next(1, 254), somthing.Next(1, 254));
                 client.Self.Movement.TurnToward(newpos);
 
                 client.Self.Movement.AtPos = true;
-                Thread.Sleep(somthing.Next(3000,13000));
+                Thread.Sleep(somthing.Next(3000, 13000));
                 client.Self.Movement.AtPos = false;
                 client.Self.Jump(true);
 
@@ -116,10 +145,6 @@ namespace pCampBot
         /// </summary>
         public void readconfig()
         {
-            firstname = startupConfig.GetString("firstname", "random");
-            lastname = startupConfig.GetString("lastname", "random");
-            password = startupConfig.GetString("password", "12345");
-            loginURI = startupConfig.GetString("loginuri");
             wear = startupConfig.GetString("wear","no");
         }
 
@@ -128,6 +153,9 @@ namespace pCampBot
         /// </summary>
         public void shutdown()
         {
+            if (m_actionThread != null)
+                m_actionThread.Abort();
+
             client.Network.Logout();
         }
 
@@ -136,7 +164,7 @@ namespace pCampBot
         /// </summary>
         public void startup()
         {
-            client.Settings.LOGIN_SERVER = loginURI;
+            client.Settings.LOGIN_SERVER = LoginUri;
             client.Settings.ALWAYS_DECODE_OBJECTS = false;
             client.Settings.AVATAR_TRACKING = false;
             client.Settings.OBJECT_TRACKING = false;
@@ -155,32 +183,32 @@ namespace pCampBot
             client.Network.SimConnected += this.Network_SimConnected;
             client.Network.Disconnected += this.Network_OnDisconnected;
             client.Objects.ObjectUpdate += Objects_NewPrim;
-            //client.Assets.OnAssetReceived += Asset_ReceivedCallback;
-            if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name"))
+
+            if (client.Network.Login(FirstName, LastName, Password, "pCampBot", "Your name"))
             {
-                if (OnConnected != null)
+                IsConnected = true;
+
+                Thread.Sleep(somthing.Next(1000, 10000));
+                m_actionThread = new Thread(Action);
+                m_actionThread.Start();
+
+//                    OnConnected(this, EventType.CONNECTED);
+                if (wear == "save")
                 {
-                    m_action = new Timer(somthing.Next(1000, 10000));
-                    m_action.Enabled = true;
-                    m_action.AutoReset = false;
-                    m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed);
-                    m_action.Start();
-                    OnConnected(this, EventType.CONNECTED);
-                    if (wear == "save")
-                    {
-                        client.Appearance.SetPreviousAppearance();
-                        SaveDefaultAppearance();
-                    }
-                    else if (wear != "no")
-                    {
-                        MakeDefaultAppearance(wear);
-                    }
-                    client.Self.Jump(true);
+                    client.Appearance.SetPreviousAppearance();
+                    SaveDefaultAppearance();
+                }
+                else if (wear != "no")
+                {
+                    MakeDefaultAppearance(wear);
                 }
+                client.Self.Jump(true);
             }
             else
             {
-                MainConsole.Instance.Output(firstname + " " + lastname + " Can't login: " + client.Network.LoginMessage);
+                MainConsole.Instance.OutputFormat(
+                    "{0} {1} cannot login: {2}", FirstName, LastName, client.Network.LoginMessage);
+
                 if (OnDisconnected != null)
                 {
                     OnDisconnected(this, EventType.DISCONNECTED);
@@ -190,7 +218,7 @@ namespace pCampBot
 
         public void SaveDefaultAppearance()
         {
-            saveDir = "MyAppearance/" + firstname + "_" + lastname;
+            saveDir = "MyAppearance/" + FirstName + "_" + LastName;
             if (!Directory.Exists(saveDir))
             {
                 Directory.CreateDirectory(saveDir);
@@ -216,7 +244,7 @@ namespace pCampBot
                 {
                     if (asset.Decode())
                     {
-                       File.WriteAllBytes(Path.Combine(saveDir, String.Format("{1}.{0}",
+                        File.WriteAllBytes(Path.Combine(saveDir, String.Format("{1}.{0}",
                         asset.AssetType.ToString().ToLower(),
                         asset.WearableType)), asset.AssetData);
                     }
@@ -366,8 +394,21 @@ namespace pCampBot
 
         public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
         {
-            if (OnDisconnected != null)
+//            m_log.ErrorFormat("Fired Network_OnDisconnected");
+
+//           if (
+//               (args.Reason == NetworkManager.DisconnectType.SimShutdown
+//                    || args.Reason == NetworkManager.DisconnectType.NetworkTimeout)
+//               && OnDisconnected != null)
+
+           if (
+               (args.Reason == NetworkManager.DisconnectType.ClientInitiated
+                    || args.Reason == NetworkManager.DisconnectType.ServerInitiated
+                    || args.Reason == NetworkManager.DisconnectType.NetworkTimeout)
+               && OnDisconnected != null)
+//            if (OnDisconnected != null)
             {
+                IsConnected = false;
                 OnDisconnected(this, EventType.DISCONNECTED);
             }
         }
@@ -382,39 +423,55 @@ namespace pCampBot
                 {
                     if (prim.Textures.DefaultTexture.TextureID != UUID.Zero)
                     {
-                        client.Assets.RequestImage(prim.Textures.DefaultTexture.TextureID, ImageType.Normal, Asset_TextureCallback_Texture);
+                        GetTexture(prim.Textures.DefaultTexture.TextureID);
                     }
+
                     for (int i = 0; i < prim.Textures.FaceTextures.Length; i++)
                     {
-                        if (prim.Textures.FaceTextures[i] != null)
-                        {
-                            if (prim.Textures.FaceTextures[i].TextureID != UUID.Zero)
-                            {
-                                client.Assets.RequestImage(prim.Textures.FaceTextures[i].TextureID, ImageType.Normal, Asset_TextureCallback_Texture);
-                            }
+                        UUID textureID = prim.Textures.FaceTextures[i].TextureID;
 
+                        if (textureID != null && textureID != UUID.Zero)
+                        {
+                            GetTexture(textureID);
                         }
                     }
                 }
+
                 if (prim.Sculpt.SculptTexture != UUID.Zero)
                 {
-                    client.Assets.RequestImage(prim.Sculpt.SculptTexture, ImageType.Normal, Asset_TextureCallback_Texture);
+                    GetTexture(prim.Sculpt.SculptTexture);
                 }
             }
         }
 
+        private void GetTexture(UUID textureID)
+        {
+            lock (BotManager.AssetsReceived)
+            {
+                // Don't request assets more than once.
+                if (BotManager.AssetsReceived.ContainsKey(textureID))
+                    return;
+
+                BotManager.AssetsReceived[textureID] = false;
+                client.Assets.RequestImage(textureID, ImageType.Normal, Asset_TextureCallback_Texture);
+            }
+        }
+
         
         public void Asset_TextureCallback_Texture(TextureRequestState state, AssetTexture assetTexture)
         {
             //TODO: Implement texture saving and applying
         }
         
-        public void Asset_ReceivedCallback(AssetDownload transfer,Asset asset)
+        public void Asset_ReceivedCallback(AssetDownload transfer, Asset asset)
         {
-            if (wear == "save")
-            {
-                SaveAsset((AssetWearable) asset);
-            }
+            lock (BotManager.AssetsReceived)
+                BotManager.AssetsReceived[asset.AssetID] = true;
+
+//            if (wear == "save")
+//            {
+//                SaveAsset((AssetWearable) asset);
+//            }
         }
 
         public string[] readexcuses()