aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-14 19:21:07 +0100
committerJustin Clark-Casey (justincc)2013-08-14 19:21:07 +0100
commit97c514daa5a3b4e4137bf01b7bee3fffc13a75d7 (patch)
tree7be3c97bd672013244ba5cb6feea53489b6eaa92
parentAdd a -form switch to pCampbot to allow one to login a sequence of bots start... (diff)
downloadopensim-SC_OLD-97c514daa5a3b4e4137bf01b7bee3fffc13a75d7.zip
opensim-SC_OLD-97c514daa5a3b4e4137bf01b7bee3fffc13a75d7.tar.gz
opensim-SC_OLD-97c514daa5a3b4e4137bf01b7bee3fffc13a75d7.tar.bz2
opensim-SC_OLD-97c514daa5a3b4e4137bf01b7bee3fffc13a75d7.tar.xz
Shutdown a bot's actions by making it check for disconnecting state rather than aborting the thread.
Aborting the thread appears to be causing shutdown issues.
-rw-r--r--OpenSim/Tools/pCampBot/Bot.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 79344e8..dac8ccb 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -158,7 +158,7 @@ namespace pCampBot
158 //add additional steps and/or things the bot should do 158 //add additional steps and/or things the bot should do
159 private void Action() 159 private void Action()
160 { 160 {
161 while (true) 161 while (ConnectionState != ConnectionState.Disconnecting)
162 lock (Behaviours) 162 lock (Behaviours)
163 Behaviours.ForEach( 163 Behaviours.ForEach(
164 b => 164 b =>
@@ -178,8 +178,8 @@ namespace pCampBot
178 { 178 {
179 ConnectionState = ConnectionState.Disconnecting; 179 ConnectionState = ConnectionState.Disconnecting;
180 180
181 if (m_actionThread != null) 181// if (m_actionThread != null)
182 m_actionThread.Abort(); 182// m_actionThread.Abort();
183 183
184 Client.Network.Logout(); 184 Client.Network.Logout();
185 } 185 }