2 files changed, 40 insertions, 29 deletions

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 1b30766..7f941a4 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -222,7 +222,7 @@ namespace pCampBot
             }
             else
             {
-                MainConsole.Instance.OutputFormat(
+                m_log.ErrorFormat(
                     "{0} {1} cannot login: {2}", FirstName, LastName, Client.Network.LoginMessage);
 
                 if (OnDisconnected != null)
@@ -266,12 +266,12 @@ namespace pCampBot
                     }
                     else
                     {
-                        MainConsole.Instance.Output(String.Format("Failed to decode {0} asset {1}", asset.AssetType, asset.AssetID));
+                        m_log.WarnFormat("Failed to decode {0} asset {1}", asset.AssetType, asset.AssetID);
                     }
                 }
                 catch (Exception e)
                 {
-                    MainConsole.Instance.Output(String.Format("Exception: {0}",e.ToString()));
+                    m_log.ErrorFormat("Exception: {0}{1}", e.Message, e.StackTrace);
                 }
             }
         }
@@ -305,7 +305,7 @@ namespace pCampBot
                 if (wear == "yes")
                 {
                     //TODO: Implement random outfit picking
-                    MainConsole.Instance.Output("Picks a random outfit. Not yet implemented.");
+                    m_log.DebugFormat("Picks a random outfit. Not yet implemented.");
                 }
                 else if (wear != "save")
                     saveDir = "MyAppearance/" + wear;
@@ -334,7 +334,9 @@ namespace pCampBot
                             listwearables.Add(item);
                         }
                         else
-                            MainConsole.Instance.Output(String.Format("Failed to create item {0}",item.Name));
+                        {
+                            m_log.WarnFormat("Failed to create item {0}", item.Name);
+                        }
                     }
                     );
                 }
@@ -356,7 +358,9 @@ namespace pCampBot
                             listwearables.Add(item);
                         }
                         else
-                            MainConsole.Instance.Output(String.Format("Failed to create item {0}",item.Name));
+                        {
+                            m_log.WarnFormat("Failed to create item {0}", item.Name);
+                        }
                     }
                     );
                 }
@@ -364,10 +368,12 @@ namespace pCampBot
                 Thread.Sleep(1000);
 
                 if (listwearables == null || listwearables.Count == 0)
-                    MainConsole.Instance.Output("Nothing to send on this folder!");
+                {
+                    m_log.DebugFormat("Nothing to send on this folder!");
+                }
                 else
                 {
-                    MainConsole.Instance.Output(String.Format("Sending {0} wearables...",listwearables.Count));
+                    m_log.DebugFormat("Sending {0} wearables...", listwearables.Count);
                     Client.Appearance.WearOutfit(listwearables, false);
                 }
             }
@@ -447,17 +453,20 @@ namespace pCampBot
 
                     for (int i = 0; i < prim.Textures.FaceTextures.Length; i++)
                     {
-                        UUID textureID = prim.Textures.FaceTextures[i].TextureID;
+                        Primitive.TextureEntryFace face = prim.Textures.FaceTextures[i];
 
-                        if (textureID != UUID.Zero)
-                            GetTexture(textureID);
+                        if (face != null)
+                        {
+                            UUID textureID = prim.Textures.FaceTextures[i].TextureID;
+
+                            if (textureID != UUID.Zero)
+                                GetTexture(textureID);
+                        }
                     }
                 }
 
-                if (prim.Sculpt.SculptTexture != UUID.Zero)
-                {
+                if (prim.Sculpt != null && prim.Sculpt.SculptTexture != UUID.Zero)
                     GetTexture(prim.Sculpt.SculptTexture);
-                }
             }
         }
 
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 704770a..f5dd5e0 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -51,7 +51,6 @@ namespace pCampBot
         protected CommandConsole m_console;
         protected List<Bot> m_lBot;
         protected Random somthing = new Random(Environment.TickCount);
-        protected int numbots = 0;
         public IConfig Config { get; private set; }
 
         /// <summary>
@@ -137,7 +136,7 @@ namespace pCampBot
                 if (behaviourSwitches.Contains("g"))
                     behaviours.Add(new GrabbingBehaviour());
 
-                startupBot(i, this, behaviours, firstName, lastName, password, loginUri);
+                StartBot(this, behaviours, firstName, lastName, password, loginUri);
             }
         }
 
@@ -157,22 +156,21 @@ namespace pCampBot
 //            int newlen = len + botcount;
 //            for (int i = len; i < newlen; i++)
 //            {
-//                startupBot(i, Config);
+//                startupBot(Config);
 //            }
 //        }
 
         /// <summary>
         /// This starts up the bot and stores the thread for the bot in the thread array
         /// </summary>
-        /// <param name="pos">The position in the thread array to stick the bot's thread</param>
         /// <param name="bm"></param>
         /// <param name="behaviours">Behaviours for this bot to perform.</param>
         /// <param name="firstName">First name</param>
         /// <param name="lastName">Last name</param>
         /// <param name="password">Password</param>
         /// <param name="loginUri">Login URI</param>
-        public void startupBot(
-             int pos, BotManager bm, List<IBehaviour> behaviours,
+        public void StartBot(
+             BotManager bm, List<IBehaviour> behaviours,
              string firstName, string lastName, string password, string loginUri)
         {
             Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri);
@@ -200,16 +198,17 @@ namespace pCampBot
             {
                 case EventType.CONNECTED:
                     m_log.Info("[" + callbot.FirstName + " " + callbot.LastName + "]: Connected");
-                    numbots++;
-//                m_log.InfoFormat("NUMBOTS {0}", numbots);
                     break;
                 case EventType.DISCONNECTED:
                     m_log.Info("[" + callbot.FirstName + " " + callbot.LastName + "]: Disconnected");
-                    numbots--;
-//                m_log.InfoFormat("NUMBOTS {0}", numbots);
-                    if (numbots <= 0)
-                        Environment.Exit(0);
-                    break;
+
+                    lock (m_lBot)
+                    {
+                        if (m_lBot.TrueForAll(b => !b.IsConnected))
+                            Environment.Exit(0);
+
+                        break;
+                    }
             }
         }
 
@@ -234,8 +233,11 @@ namespace pCampBot
 
         private void HandleShutdown(string module, string[] cmd)
         {
-            m_log.Warn("[BOTMANAGER]: Shutting down bots");
-            doBotShutdown();
+            Util.FireAndForget(o =>
+            {
+                m_log.Warn("[BOTMANAGER]: Shutting down bots");
+                doBotShutdown();
+            });
         }
 
         private void HandleShowStatus(string module, string[] cmd)