diff options
Diffstat (limited to 'OpenSim/Tools')
-rw-r--r-- | OpenSim/Tools/pCampBot/BotManager.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index c4c6f8f..f5dd5e0 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs | |||
@@ -136,7 +136,7 @@ namespace pCampBot | |||
136 | if (behaviourSwitches.Contains("g")) | 136 | if (behaviourSwitches.Contains("g")) |
137 | behaviours.Add(new GrabbingBehaviour()); | 137 | behaviours.Add(new GrabbingBehaviour()); |
138 | 138 | ||
139 | startupBot(i, this, behaviours, firstName, lastName, password, loginUri); | 139 | StartBot(this, behaviours, firstName, lastName, password, loginUri); |
140 | } | 140 | } |
141 | } | 141 | } |
142 | 142 | ||
@@ -156,22 +156,21 @@ namespace pCampBot | |||
156 | // int newlen = len + botcount; | 156 | // int newlen = len + botcount; |
157 | // for (int i = len; i < newlen; i++) | 157 | // for (int i = len; i < newlen; i++) |
158 | // { | 158 | // { |
159 | // startupBot(i, Config); | 159 | // startupBot(Config); |
160 | // } | 160 | // } |
161 | // } | 161 | // } |
162 | 162 | ||
163 | /// <summary> | 163 | /// <summary> |
164 | /// This starts up the bot and stores the thread for the bot in the thread array | 164 | /// This starts up the bot and stores the thread for the bot in the thread array |
165 | /// </summary> | 165 | /// </summary> |
166 | /// <param name="pos">The position in the thread array to stick the bot's thread</param> | ||
167 | /// <param name="bm"></param> | 166 | /// <param name="bm"></param> |
168 | /// <param name="behaviours">Behaviours for this bot to perform.</param> | 167 | /// <param name="behaviours">Behaviours for this bot to perform.</param> |
169 | /// <param name="firstName">First name</param> | 168 | /// <param name="firstName">First name</param> |
170 | /// <param name="lastName">Last name</param> | 169 | /// <param name="lastName">Last name</param> |
171 | /// <param name="password">Password</param> | 170 | /// <param name="password">Password</param> |
172 | /// <param name="loginUri">Login URI</param> | 171 | /// <param name="loginUri">Login URI</param> |
173 | public void startupBot( | 172 | public void StartBot( |
174 | int pos, BotManager bm, List<IBehaviour> behaviours, | 173 | BotManager bm, List<IBehaviour> behaviours, |
175 | string firstName, string lastName, string password, string loginUri) | 174 | string firstName, string lastName, string password, string loginUri) |
176 | { | 175 | { |
177 | Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri); | 176 | Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri); |
@@ -234,8 +233,11 @@ namespace pCampBot | |||
234 | 233 | ||
235 | private void HandleShutdown(string module, string[] cmd) | 234 | private void HandleShutdown(string module, string[] cmd) |
236 | { | 235 | { |
237 | m_log.Warn("[BOTMANAGER]: Shutting down bots"); | 236 | Util.FireAndForget(o => |
238 | doBotShutdown(); | 237 | { |
238 | m_log.Warn("[BOTMANAGER]: Shutting down bots"); | ||
239 | doBotShutdown(); | ||
240 | }); | ||
239 | } | 241 | } |
240 | 242 | ||
241 | private void HandleShowStatus(string module, string[] cmd) | 243 | private void HandleShowStatus(string module, string[] cmd) |