1 files changed, 18 insertions, 4 deletions

diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index a69fbf0..4d3b06d 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -26,6 +26,8 @@
  */
 
 using System;
+using System.Reflection;
+using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
@@ -44,6 +46,8 @@ namespace pCampBot
 
     public class pCampBot
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         [STAThread]
         public static void Main(string[] args)
         {
@@ -60,9 +64,17 @@ namespace pCampBot
 
                 //startup specified number of bots.  1 is the default
                 bm.dobotStartup(botcount, config);
+
                 while (true)
                 {
-                    MainConsole.Instance.Prompt();
+                    try
+                    {
+                        MainConsole.Instance.Prompt();
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("Command error: {0}", e);
+                    }
                 }
             }
         }
@@ -72,12 +84,13 @@ namespace pCampBot
             //Set up our nifty config..  thanks to nini
             ArgvConfigSource cs = new ArgvConfigSource(args);
 
-            cs.AddSwitch("Startup", "botcount","n");
-            cs.AddSwitch("Startup", "loginuri","l");
+            cs.AddSwitch("Startup", "botcount", "n");
+            cs.AddSwitch("Startup", "loginuri", "l");
             cs.AddSwitch("Startup", "firstname");
             cs.AddSwitch("Startup", "lastname");
             cs.AddSwitch("Startup", "password");
-            cs.AddSwitch("Startup", "help","h");
+            cs.AddSwitch("Startup", "behaviours", "b");
+            cs.AddSwitch("Startup", "help", "h");
             cs.AddSwitch("Startup", "wear");
 
             IConfig ol = cs.Configs["Startup"];
@@ -98,6 +111,7 @@ namespace pCampBot
                                      "  -firstname         first name for the bots\n" +
                                      "  -lastname          lastname for the bots.  Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n" +
                                      "  -password          password for the bots\n" +
+                                     "  -b, behaviours     behaviours for bots.  Current options p (physics), g (grab).  Comma separated, e.g. p,g.  Default is p",
                                      "  -wear              set appearance folder to load from (default: no)\n" +
                                      "  -h, -help          show this message"
                                      );