Merge branch 'master' into v3_support

3 files changed, 12 insertions, 1 deletions

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 0bd0bcc..da090dd 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -420,6 +420,8 @@ namespace pCampBot
 
         public void Network_LoginProgress(object sender, LoginProgressEventArgs args)
         {
+            m_log.DebugFormat("[BOT]: Bot {0} {1} in Network_LoginProcess", Name, args.Status);
+
             if (args.Status == LoginStatus.Success)
             {
                 if (OnConnected != null)
@@ -431,10 +433,15 @@ namespace pCampBot
 
         public void Network_SimConnected(object sender, SimConnectedEventArgs args)
         {
+            m_log.DebugFormat(
+                "[BOT]: Bot {0} connected to {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint);
         }
 
         public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
         {
+            m_log.DebugFormat(
+                "[BOT]: Bot {0} disconnected reason {1}, message {2}", Name, args.Reason, args.Message);
+
 //            m_log.ErrorFormat("Fired Network_OnDisconnected");
 
 //           if (
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 6481e97..0f501b7 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -266,7 +266,7 @@ namespace pCampBot
         /// <returns></returns>
         protected CommandConsole CreateConsole()
         {
-            return new LocalConsole("Region");
+            return new LocalConsole("pCampbot");
         }
 
         private void HandleShutdown(string module, string[] cmd)
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index a73fcbe..ec5ad04 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -56,6 +56,10 @@ namespace pCampBot
             {
                 Help();
             }
+            else if (config.Get("firstname") == null ||  config.Get("lastname") == null || config.Get("password") == null)
+            {
+                Console.WriteLine("ERROR: You must supply a firstname, lastname and password for the bots.");
+            }
             else
             {
                 int botcount = config.GetInt("botcount", 1);