From 0e07fad2e16ef135c71440ae3c6c909c4eee4a86 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 31 Oct 2013 20:19:57 +0000 Subject: minor: update pCampbot usage/help statement --- OpenSim/Tools/pCampBot/pCampBot.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Tools/pCampBot') diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs index 781bb00..1fb0e03 100644 --- a/OpenSim/Tools/pCampBot/pCampBot.cs +++ b/OpenSim/Tools/pCampBot/pCampBot.cs @@ -151,17 +151,17 @@ namespace pCampBot // worn to the folder MyAppearance/FirstName_LastName, and the load it. Console.WriteLine( - "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + "Usage: pCampBot -loginuri -firstname -lastname -password [OPTIONS]\n" + "Spawns a set of bots to test an OpenSim region\n\n" + " -l, -loginuri loginuri for grid/standalone (required)\n" - + " -s, -start start location for bots (optional). Can be \"last\", \"home\" or a specific location with or without co-ords (e.g. \"region1\" or \"region2/50/30/90\"\n" + + " -s, -start start location for bots (default: last) (optional). Can be \"last\", \"home\" or a specific location with or without co-ords (e.g. \"region1\" or \"region2/50/30/90\"\n" + " -firstname first name for the bots (required)\n" + " -lastname lastname for the bots (required). Each lastname will have _ appended, e.g. Ima Bot_0\n" + " -password password for the bots (required)\n" + " -n, -botcount number of bots to start (default: 1) (optional)\n" - + " -f, -from starting number for login bot names, e.g. 25 will login Ima Bot_25, Ima Bot_26, etc. (default: 0) (optional)\n" + + " -f, -from starting number for login bot names, e.g. 25 will login Ima Bot_25, Ima Bot_26, etc. (default: 0) (optional)\n" + " -c, -connect connect all bots at startup (optional)\n" - + " -b, behaviours behaviours for bots. Comma separated, e.g. p,g. Default is p (required)\n" + + " -b, behaviours behaviours for bots. Comma separated, e.g. p,g (default: p) (optional)\n" + " current options are:\n" + " p (physics - bots constantly move and jump around)\n" + " g (grab - bots randomly click prims whether set clickable or not)\n" -- cgit v1.1 From cc7065f9ee0598640ac24e2672f8a0ba8744fd40 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 1 Nov 2013 00:04:18 +0000 Subject: minor: change "bot" pCampBot help cateogry to "Bots" --- OpenSim/Tools/pCampBot/BotManager.cs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'OpenSim/Tools/pCampBot') diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 3c1b11e..abc71cb 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs @@ -176,57 +176,57 @@ namespace pCampBot } m_console.Commands.AddCommand( - "bot", false, "shutdown", "shutdown", "Shutdown bots and exit", HandleShutdown); + "Bots", false, "shutdown", "shutdown", "Shutdown bots and exit", HandleShutdown); m_console.Commands.AddCommand( - "bot", false, "quit", "quit", "Shutdown bots and exit", HandleShutdown); + "Bots", false, "quit", "quit", "Shutdown bots and exit", HandleShutdown); m_console.Commands.AddCommand( - "bot", false, "connect", "connect []", "Connect bots", + "Bots", false, "connect", "connect []", "Connect bots", "If an is given, then the first disconnected bots by postfix number are connected.\n" + "If no is given, then all currently disconnected bots are connected.", HandleConnect); m_console.Commands.AddCommand( - "bot", false, "disconnect", "disconnect []", "Disconnect bots", + "Bots", false, "disconnect", "disconnect []", "Disconnect bots", "Disconnecting bots will interupt any bot connection process, including connection on startup.\n" + "If an is given, then the last connected bots by postfix number are disconnected.\n" + "If no is given, then all currently connected bots are disconnected.", HandleDisconnect); m_console.Commands.AddCommand( - "bot", false, "add behaviour", "add behaviour []", + "Bots", false, "add behaviour", "add behaviour []", "Add a behaviour to a bot", "If no bot number is specified then behaviour is added to all bots.\n" + "Can be performed on connected or disconnected bots.", HandleAddBehaviour); m_console.Commands.AddCommand( - "bot", false, "remove behaviour", "remove behaviour []", + "Bots", false, "remove behaviour", "remove behaviour []", "Remove a behaviour from a bot", "If no bot number is specified then behaviour is added to all bots.\n" + "Can be performed on connected or disconnected bots.", HandleRemoveBehaviour); m_console.Commands.AddCommand( - "bot", false, "sit", "sit", "Sit all bots on the ground.", + "Bots", false, "sit", "sit", "Sit all bots on the ground.", HandleSit); m_console.Commands.AddCommand( - "bot", false, "stand", "stand", "Stand all bots.", + "Bots", false, "stand", "stand", "Stand all bots.", HandleStand); m_console.Commands.AddCommand( - "bot", false, "set bots", "set bots ", "Set a setting for all bots.", HandleSetBots); + "Bots", false, "set bots", "set bots ", "Set a setting for all bots.", HandleSetBots); m_console.Commands.AddCommand( - "bot", false, "show regions", "show regions", "Show regions known to bots", HandleShowRegions); + "Bots", false, "show regions", "show regions", "Show regions known to bots", HandleShowRegions); m_console.Commands.AddCommand( - "bot", false, "show bots", "show bots", "Shows the status of all bots", HandleShowBotsStatus); + "Bots", false, "show bots", "show bots", "Shows the status of all bots", HandleShowBotsStatus); m_console.Commands.AddCommand( - "bot", false, "show bot", "show bot ", + "Bots", false, "show bot", "show bot ", "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus); m_bots = new List(); -- cgit v1.1 From c6395240f0dd7767cb9f14f2ad8b6cccadf1351a Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 1 Nov 2013 02:04:04 +0000 Subject: For individual bots, seed random number generator with a random number from BotManager rather than Environment.Tickcount Otherwise, since bots are now created all at once, a bunch will get exactly the same tickcount and hence number sequences --- OpenSim/Tools/pCampBot/Bot.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Tools/pCampBot') diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs index d0a4ef3..ccc24fa 100644 --- a/OpenSim/Tools/pCampBot/Bot.cs +++ b/OpenSim/Tools/pCampBot/Bot.cs @@ -166,7 +166,7 @@ namespace pCampBot { ConnectionState = ConnectionState.Disconnected; - Random = new Random(Environment.TickCount);// We do stuff randomly here + Random = new Random(bm.Rng.Next()); FirstName = firstName; LastName = lastName; Name = string.Format("{0} {1}", FirstName, LastName); -- cgit v1.1