OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add -connect (-c) switch to pCampbot command line options. 

Now, bots will only connect at startup if this switch is specified.
If it is not specified, then a separate "connect" command is required on the pCampbot command line
0.7.6-extended
Justin Clark-Casey (justincc) 2013-08-20 00:08:47 +01:00
parent 589b1a2eaf
commit a3dd7db4a3
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Tools/pCampBot/pCampBot.cs
View File

@ -94,9 +94,12 @@ namespace pCampBot
} }
int botcount = commandLineConfig.GetInt("botcount", 1); int botcount = commandLineConfig.GetInt("botcount", 1);
bool startConnected = commandLineConfig.Get("connect") != null;
bm.CreateBots(botcount, commandLineConfig); bm.CreateBots(botcount, commandLineConfig);
bm.ConnectBots(botcount);
if (startConnected)
bm.ConnectBots(botcount);
while (true) while (true)
{ {
@ -117,6 +120,7 @@ namespace pCampBot
//Set up our nifty config.. thanks to nini //Set up our nifty config.. thanks to nini
ArgvConfigSource cs = new ArgvConfigSource(args); ArgvConfigSource cs = new ArgvConfigSource(args);
cs.AddSwitch("Startup", "connect", "c");
cs.AddSwitch("Startup", "botcount", "n"); cs.AddSwitch("Startup", "botcount", "n");
cs.AddSwitch("Startup", "from", "f"); cs.AddSwitch("Startup", "from", "f");
cs.AddSwitch("Startup", "loginuri", "l"); cs.AddSwitch("Startup", "loginuri", "l");
@ -143,20 +147,21 @@ namespace pCampBot
"usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n"
+ "Spawns a set of bots to test an OpenSim region\n\n" + "Spawns a set of bots to test an OpenSim region\n\n"
+ " -l, -loginuri loginuri for grid/standalone (required)\n" + " -l, -loginuri loginuri for grid/standalone (required)\n"
+ " -s, -start optional start location for bots. 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 (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\n" + " -firstname first name for the bots (required)\n"
+ " -lastname lastname for the bots. Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n" + " -lastname lastname for the bots (required). Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n"
+ " -password password for the bots\n" + " -password password for the bots (required)\n"
+ " -n, -botcount optional number of bots to start (default: 1)\n" + " -n, -botcount number of bots to start (default: 1) (optional)\n"
+ " -f, -from optional starting number for login bot names, e.g. 25 will login Ima Bot_25, Ima Bot_26, etc. (default: 0)" + " -f, -from starting number for login bot names, e.g. 25 will login Ima Bot_25, Ima Bot_26, etc. (default: 0) (optional)\n"
+ " -b, behaviours behaviours for bots. Comma separated, e.g. p,g. Default is p\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"
+ " current options are:\n" + " current options are:\n"
+ " p (physics - bots constantly move and jump around)\n" + " p (physics - bots constantly move and jump around)\n"
+ " g (grab - bots randomly click prims whether set clickable or not)\n" + " g (grab - bots randomly click prims whether set clickable or not)\n"
+ " n (none - bots do nothing)\n" + " n (none - bots do nothing)\n"
+ " t (teleport - bots regularly teleport between regions on the grid)\n" + " t (teleport - bots regularly teleport between regions on the grid)\n"
// " c (cross)" + // " c (cross)\n" +
+ " -wear optional folder from which to load appearance data, \"no\" if there is no such folder (default: no)\n" + " -wear folder from which to load appearance data, \"no\" if there is no such folder (default: no) (optional)\n"
+ " -h, -help show this message.\n"); + " -h, -help show this message.\n");
} }
} }