Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
commit
e7fed80e85
|
@ -56,7 +56,7 @@ namespace OpenSim
|
|||
protected bool m_gui = false;
|
||||
protected string m_consoleType = "local";
|
||||
protected uint m_consolePort = 0;
|
||||
protected string m_custom_prompt;
|
||||
protected string m_custom_prompt;
|
||||
|
||||
private string m_timedScript = "disabled";
|
||||
private Timer m_scriptTimer;
|
||||
|
@ -86,7 +86,9 @@ namespace OpenSim
|
|||
|
||||
if (networkConfig != null)
|
||||
m_consolePort = (uint)networkConfig.GetInt("console_port", 0);
|
||||
|
||||
m_timedScript = startupConfig.GetString("timer_Script", "disabled");
|
||||
|
||||
if (m_logFileAppender != null)
|
||||
{
|
||||
if (m_logFileAppender is log4net.Appender.FileAppender)
|
||||
|
@ -109,7 +111,7 @@ namespace OpenSim
|
|||
Util.FireAndForgetMethod = asyncCallMethod;
|
||||
|
||||
stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 15);
|
||||
m_custom_prompt = startupConfig.GetString("custom_prompt", "Region");
|
||||
m_custom_prompt = startupConfig.GetString("custom_prompt", "Region");
|
||||
}
|
||||
|
||||
if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)
|
||||
|
@ -830,9 +832,10 @@ namespace OpenSim
|
|||
{
|
||||
MainConsole.Instance.Output("Usage: change region <region name>");
|
||||
}
|
||||
|
||||
string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName);
|
||||
MainConsole.Instance.Output(String.Format("Currently selected region is {0}", regionName));
|
||||
m_console.DefaultPrompt = String.Format("{0} ({1}) ", m_custom_prompt, regionName);
|
||||
m_console.DefaultPrompt = String.Format("{0} ({1}) ", m_custom_prompt, regionName);
|
||||
m_console.ConsoleScene = m_sceneManager.CurrentScene;
|
||||
}
|
||||
|
||||
|
|
|
@ -136,7 +136,7 @@ namespace pCampBot
|
|||
if (behaviourSwitches.Contains("g"))
|
||||
behaviours.Add(new GrabbingBehaviour());
|
||||
|
||||
startupBot(i, this, behaviours, firstName, lastName, password, loginUri);
|
||||
StartBot(this, behaviours, firstName, lastName, password, loginUri);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -156,22 +156,21 @@ namespace pCampBot
|
|||
// int newlen = len + botcount;
|
||||
// for (int i = len; i < newlen; i++)
|
||||
// {
|
||||
// startupBot(i, Config);
|
||||
// startupBot(Config);
|
||||
// }
|
||||
// }
|
||||
|
||||
/// <summary>
|
||||
/// This starts up the bot and stores the thread for the bot in the thread array
|
||||
/// </summary>
|
||||
/// <param name="pos">The position in the thread array to stick the bot's thread</param>
|
||||
/// <param name="bm"></param>
|
||||
/// <param name="behaviours">Behaviours for this bot to perform.</param>
|
||||
/// <param name="firstName">First name</param>
|
||||
/// <param name="lastName">Last name</param>
|
||||
/// <param name="password">Password</param>
|
||||
/// <param name="loginUri">Login URI</param>
|
||||
public void startupBot(
|
||||
int pos, BotManager bm, List<IBehaviour> behaviours,
|
||||
public void StartBot(
|
||||
BotManager bm, List<IBehaviour> behaviours,
|
||||
string firstName, string lastName, string password, string loginUri)
|
||||
{
|
||||
Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri);
|
||||
|
@ -234,8 +233,11 @@ namespace pCampBot
|
|||
|
||||
private void HandleShutdown(string module, string[] cmd)
|
||||
{
|
||||
m_log.Warn("[BOTMANAGER]: Shutting down bots");
|
||||
doBotShutdown();
|
||||
Util.FireAndForget(o =>
|
||||
{
|
||||
m_log.Warn("[BOTMANAGER]: Shutting down bots");
|
||||
doBotShutdown();
|
||||
});
|
||||
}
|
||||
|
||||
private void HandleShowStatus(string module, string[] cmd)
|
||||
|
|
Loading…
Reference in New Issue