diff options
author | Robert Adams | 2013-11-04 22:12:57 -0800 |
---|---|---|
committer | Robert Adams | 2013-11-04 22:12:57 -0800 |
commit | c931b16c1fd50d3b955662c8cd6134d7a235c519 (patch) | |
tree | 8aeca3e6dccf6b177908f3842196f59230777109 /OpenSim/Tools/pCampBot | |
parent | varregion: add plumbing to pass region size from Scene down to the (diff) | |
parent | If the LSL state_entry() event definition contains any parameters, then gener... (diff) | |
download | opensim-SC-c931b16c1fd50d3b955662c8cd6134d7a235c519.zip opensim-SC-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.gz opensim-SC-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.bz2 opensim-SC-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.xz |
Merge branch 'master' into varregion
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tools/pCampBot/Bot.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/BotManager.cs | 24 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/pCampBot.cs | 8 |
3 files changed, 17 insertions, 17 deletions
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 | |||
166 | { | 166 | { |
167 | ConnectionState = ConnectionState.Disconnected; | 167 | ConnectionState = ConnectionState.Disconnected; |
168 | 168 | ||
169 | Random = new Random(Environment.TickCount);// We do stuff randomly here | 169 | Random = new Random(bm.Rng.Next()); |
170 | FirstName = firstName; | 170 | FirstName = firstName; |
171 | LastName = lastName; | 171 | LastName = lastName; |
172 | Name = string.Format("{0} {1}", FirstName, LastName); | 172 | Name = string.Format("{0} {1}", FirstName, LastName); |
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 | |||
176 | } | 176 | } |
177 | 177 | ||
178 | m_console.Commands.AddCommand( | 178 | m_console.Commands.AddCommand( |
179 | "bot", false, "shutdown", "shutdown", "Shutdown bots and exit", HandleShutdown); | 179 | "Bots", false, "shutdown", "shutdown", "Shutdown bots and exit", HandleShutdown); |
180 | 180 | ||
181 | m_console.Commands.AddCommand( | 181 | m_console.Commands.AddCommand( |
182 | "bot", false, "quit", "quit", "Shutdown bots and exit", HandleShutdown); | 182 | "Bots", false, "quit", "quit", "Shutdown bots and exit", HandleShutdown); |
183 | 183 | ||
184 | m_console.Commands.AddCommand( | 184 | m_console.Commands.AddCommand( |
185 | "bot", false, "connect", "connect [<n>]", "Connect bots", | 185 | "Bots", false, "connect", "connect [<n>]", "Connect bots", |
186 | "If an <n> is given, then the first <n> disconnected bots by postfix number are connected.\n" | 186 | "If an <n> is given, then the first <n> disconnected bots by postfix number are connected.\n" |
187 | + "If no <n> is given, then all currently disconnected bots are connected.", | 187 | + "If no <n> is given, then all currently disconnected bots are connected.", |
188 | HandleConnect); | 188 | HandleConnect); |
189 | 189 | ||
190 | m_console.Commands.AddCommand( | 190 | m_console.Commands.AddCommand( |
191 | "bot", false, "disconnect", "disconnect [<n>]", "Disconnect bots", | 191 | "Bots", false, "disconnect", "disconnect [<n>]", "Disconnect bots", |
192 | "Disconnecting bots will interupt any bot connection process, including connection on startup.\n" | 192 | "Disconnecting bots will interupt any bot connection process, including connection on startup.\n" |
193 | + "If an <n> is given, then the last <n> connected bots by postfix number are disconnected.\n" | 193 | + "If an <n> is given, then the last <n> connected bots by postfix number are disconnected.\n" |
194 | + "If no <n> is given, then all currently connected bots are disconnected.", | 194 | + "If no <n> is given, then all currently connected bots are disconnected.", |
195 | HandleDisconnect); | 195 | HandleDisconnect); |
196 | 196 | ||
197 | m_console.Commands.AddCommand( | 197 | m_console.Commands.AddCommand( |
198 | "bot", false, "add behaviour", "add behaviour <abbreviated-name> [<bot-number>]", | 198 | "Bots", false, "add behaviour", "add behaviour <abbreviated-name> [<bot-number>]", |
199 | "Add a behaviour to a bot", | 199 | "Add a behaviour to a bot", |
200 | "If no bot number is specified then behaviour is added to all bots.\n" | 200 | "If no bot number is specified then behaviour is added to all bots.\n" |
201 | + "Can be performed on connected or disconnected bots.", | 201 | + "Can be performed on connected or disconnected bots.", |
202 | HandleAddBehaviour); | 202 | HandleAddBehaviour); |
203 | 203 | ||
204 | m_console.Commands.AddCommand( | 204 | m_console.Commands.AddCommand( |
205 | "bot", false, "remove behaviour", "remove behaviour <abbreviated-name> [<bot-number>]", | 205 | "Bots", false, "remove behaviour", "remove behaviour <abbreviated-name> [<bot-number>]", |
206 | "Remove a behaviour from a bot", | 206 | "Remove a behaviour from a bot", |
207 | "If no bot number is specified then behaviour is added to all bots.\n" | 207 | "If no bot number is specified then behaviour is added to all bots.\n" |
208 | + "Can be performed on connected or disconnected bots.", | 208 | + "Can be performed on connected or disconnected bots.", |
209 | HandleRemoveBehaviour); | 209 | HandleRemoveBehaviour); |
210 | 210 | ||
211 | m_console.Commands.AddCommand( | 211 | m_console.Commands.AddCommand( |
212 | "bot", false, "sit", "sit", "Sit all bots on the ground.", | 212 | "Bots", false, "sit", "sit", "Sit all bots on the ground.", |
213 | HandleSit); | 213 | HandleSit); |
214 | 214 | ||
215 | m_console.Commands.AddCommand( | 215 | m_console.Commands.AddCommand( |
216 | "bot", false, "stand", "stand", "Stand all bots.", | 216 | "Bots", false, "stand", "stand", "Stand all bots.", |
217 | HandleStand); | 217 | HandleStand); |
218 | 218 | ||
219 | m_console.Commands.AddCommand( | 219 | m_console.Commands.AddCommand( |
220 | "bot", false, "set bots", "set bots <key> <value>", "Set a setting for all bots.", HandleSetBots); | 220 | "Bots", false, "set bots", "set bots <key> <value>", "Set a setting for all bots.", HandleSetBots); |
221 | 221 | ||
222 | m_console.Commands.AddCommand( | 222 | m_console.Commands.AddCommand( |
223 | "bot", false, "show regions", "show regions", "Show regions known to bots", HandleShowRegions); | 223 | "Bots", false, "show regions", "show regions", "Show regions known to bots", HandleShowRegions); |
224 | 224 | ||
225 | m_console.Commands.AddCommand( | 225 | m_console.Commands.AddCommand( |
226 | "bot", false, "show bots", "show bots", "Shows the status of all bots", HandleShowBotsStatus); | 226 | "Bots", false, "show bots", "show bots", "Shows the status of all bots", HandleShowBotsStatus); |
227 | 227 | ||
228 | m_console.Commands.AddCommand( | 228 | m_console.Commands.AddCommand( |
229 | "bot", false, "show bot", "show bot <bot-number>", | 229 | "Bots", false, "show bot", "show bot <bot-number>", |
230 | "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus); | 230 | "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus); |
231 | 231 | ||
232 | m_bots = new List<Bot>(); | 232 | m_bots = new List<Bot>(); |
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 | |||
151 | // worn to the folder MyAppearance/FirstName_LastName, and the load it. | 151 | // worn to the folder MyAppearance/FirstName_LastName, and the load it. |
152 | 152 | ||
153 | Console.WriteLine( | 153 | Console.WriteLine( |
154 | "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" | 154 | "Usage: pCampBot -loginuri <loginuri> -firstname <first-name> -lastname <last-name> -password <password> [OPTIONS]\n" |
155 | + "Spawns a set of bots to test an OpenSim region\n\n" | 155 | + "Spawns a set of bots to test an OpenSim region\n\n" |
156 | + " -l, -loginuri loginuri for grid/standalone (required)\n" | 156 | + " -l, -loginuri loginuri for grid/standalone (required)\n" |
157 | + " -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" | 157 | + " -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" |
158 | + " -firstname first name for the bots (required)\n" | 158 | + " -firstname first name for the bots (required)\n" |
159 | + " -lastname lastname for the bots (required). Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n" | 159 | + " -lastname lastname for the bots (required). Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n" |
160 | + " -password password for the bots (required)\n" | 160 | + " -password password for the bots (required)\n" |
161 | + " -n, -botcount number of bots to start (default: 1) (optional)\n" | 161 | + " -n, -botcount number of bots to start (default: 1) (optional)\n" |
162 | + " -f, -from starting number for login bot names, e.g. 25 will login Ima Bot_25, Ima Bot_26, etc. (default: 0) (optional)\n" | 162 | + " -f, -from starting number for login bot names, e.g. 25 will login Ima Bot_25, Ima Bot_26, etc. (default: 0) (optional)\n" |
163 | + " -c, -connect connect all bots at startup (optional)\n" | 163 | + " -c, -connect connect all bots at startup (optional)\n" |
164 | + " -b, behaviours behaviours for bots. Comma separated, e.g. p,g. Default is p (required)\n" | 164 | + " -b, behaviours behaviours for bots. Comma separated, e.g. p,g (default: p) (optional)\n" |
165 | + " current options are:\n" | 165 | + " current options are:\n" |
166 | + " p (physics - bots constantly move and jump around)\n" | 166 | + " p (physics - bots constantly move and jump around)\n" |
167 | + " g (grab - bots randomly click prims whether set clickable or not)\n" | 167 | + " g (grab - bots randomly click prims whether set clickable or not)\n" |