aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Tools/pCampBot/pCampBot.cs25
1 files changed, 15 insertions, 10 deletions
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index ada39ee..fc67398 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -94,9 +94,12 @@ namespace pCampBot
94 } 94 }
95 95
96 int botcount = commandLineConfig.GetInt("botcount", 1); 96 int botcount = commandLineConfig.GetInt("botcount", 1);
97 bool startConnected = commandLineConfig.Get("connect") != null;
97 98
98 bm.CreateBots(botcount, commandLineConfig); 99 bm.CreateBots(botcount, commandLineConfig);
99 bm.ConnectBots(botcount); 100
101 if (startConnected)
102 bm.ConnectBots(botcount);
100 103
101 while (true) 104 while (true)
102 { 105 {
@@ -117,6 +120,7 @@ namespace pCampBot
117 //Set up our nifty config.. thanks to nini 120 //Set up our nifty config.. thanks to nini
118 ArgvConfigSource cs = new ArgvConfigSource(args); 121 ArgvConfigSource cs = new ArgvConfigSource(args);
119 122
123 cs.AddSwitch("Startup", "connect", "c");
120 cs.AddSwitch("Startup", "botcount", "n"); 124 cs.AddSwitch("Startup", "botcount", "n");
121 cs.AddSwitch("Startup", "from", "f"); 125 cs.AddSwitch("Startup", "from", "f");
122 cs.AddSwitch("Startup", "loginuri", "l"); 126 cs.AddSwitch("Startup", "loginuri", "l");
@@ -143,20 +147,21 @@ namespace pCampBot
143 "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" 147 "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n"
144 + "Spawns a set of bots to test an OpenSim region\n\n" 148 + "Spawns a set of bots to test an OpenSim region\n\n"
145 + " -l, -loginuri loginuri for grid/standalone (required)\n" 149 + " -l, -loginuri loginuri for grid/standalone (required)\n"
146 + " -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" 150 + " -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"
147 + " -firstname first name for the bots\n" 151 + " -firstname first name for the bots (required)\n"
148 + " -lastname lastname for the bots. Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n" 152 + " -lastname lastname for the bots (required). Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n"
149 + " -password password for the bots\n" 153 + " -password password for the bots (required)\n"
150 + " -n, -botcount optional number of bots to start (default: 1)\n" 154 + " -n, -botcount number of bots to start (default: 1) (optional)\n"
151 + " -f, -from optional starting number for login bot names, e.g. 25 will login Ima Bot_25, Ima Bot_26, etc. (default: 0)" 155 + " -f, -from starting number for login bot names, e.g. 25 will login Ima Bot_25, Ima Bot_26, etc. (default: 0) (optional)\n"
152 + " -b, behaviours behaviours for bots. Comma separated, e.g. p,g. Default is p\n" 156 + " -c, -connect connect all bots at startup (optional)\n"
157 + " -b, behaviours behaviours for bots. Comma separated, e.g. p,g. Default is p (required)\n"
153 + " current options are:\n" 158 + " current options are:\n"
154 + " p (physics - bots constantly move and jump around)\n" 159 + " p (physics - bots constantly move and jump around)\n"
155 + " g (grab - bots randomly click prims whether set clickable or not)\n" 160 + " g (grab - bots randomly click prims whether set clickable or not)\n"
156 + " n (none - bots do nothing)\n" 161 + " n (none - bots do nothing)\n"
157 + " t (teleport - bots regularly teleport between regions on the grid)\n" 162 + " t (teleport - bots regularly teleport between regions on the grid)\n"
158// " c (cross)" + 163// " c (cross)\n" +
159 + " -wear optional folder from which to load appearance data, \"no\" if there is no such folder (default: no)\n" 164 + " -wear folder from which to load appearance data, \"no\" if there is no such folder (default: no) (optional)\n"
160 + " -h, -help show this message.\n"); 165 + " -h, -help show this message.\n");
161 } 166 }
162 } 167 }