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

Fix a further bug in pCampbot connect where ignoring already connected bots was wrongly counted as a connect 

Also, only sleep when we actually perform a connection
0.7.6-extended
Justin Clark-Casey (justincc) 2013-08-22 23:49:19 +01:00
parent 70f89ae65b
commit 13556cf129
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Tools/pCampBot/BotManager.cs
View File

@ -277,11 +277,11 @@ namespace pCampBot
connectBotThread.Start(); connectBotThread.Start();
} }
private void ConnectBotsInternal(int botcount) private void ConnectBotsInternal(int botCount)
{ {
MainConsole.Instance.OutputFormat( MainConsole.Instance.OutputFormat(
"[BOT MANAGER]: Starting {0} bots connecting to {1}, location {2}, named {3} {4}_<n>", "[BOT MANAGER]: Starting {0} bots connecting to {1}, location {2}, named {3} {4}_<n>",
botcount, botCount,
m_loginUri, m_loginUri,
m_startUri, m_startUri,
m_firstName, m_firstName,
@ -291,7 +291,9 @@ namespace pCampBot
MainConsole.Instance.OutputFormat("[BOT MANAGER]: BotsSendAgentUpdates is {0}", InitBotSendAgentUpdates); MainConsole.Instance.OutputFormat("[BOT MANAGER]: BotsSendAgentUpdates is {0}", InitBotSendAgentUpdates);
MainConsole.Instance.OutputFormat("[BOT MANAGER]: InitBotRequestObjectTextures is {0}", InitBotRequestObjectTextures); MainConsole.Instance.OutputFormat("[BOT MANAGER]: InitBotRequestObjectTextures is {0}", InitBotRequestObjectTextures);
for (int i = 0; i < botcount; i++) int connectedBots = 0;
for (int i = 0; i < m_bots.Count; i++)
{ {
lock (m_bots) lock (m_bots)
{ {
@ -303,11 +305,17 @@ namespace pCampBot
} }
if (m_bots[i].ConnectionState == ConnectionState.Disconnected) if (m_bots[i].ConnectionState == ConnectionState.Disconnected)
{
m_bots[i].Connect(); m_bots[i].Connect();
} connectedBots++;
// Stagger logins if (connectedBots >= botCount)
Thread.Sleep(LoginDelay); break;
// Stagger logins
Thread.Sleep(LoginDelay);
}
}
} }
ConnectingBots = false; ConnectingBots = false;