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

Merge branch 'master' into bigmerge

avinationmerge
Melanie 2011-11-10 20:56:44 +00:00
parent 063920e0a2 444b345cdf
commit cb7ea68942
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Application/OpenSim.cs
View File

@ -56,7 +56,7 @@ namespace OpenSim
protected bool m_gui = false; protected bool m_gui = false;
protected string m_consoleType = "local"; protected string m_consoleType = "local";
protected uint m_consolePort = 0; protected uint m_consolePort = 0;
protected string m_custom_prompt; protected string m_custom_prompt;
private string m_timedScript = "disabled"; private string m_timedScript = "disabled";
private Timer m_scriptTimer; private Timer m_scriptTimer;
@ -86,7 +86,9 @@ namespace OpenSim
if (networkConfig != null) if (networkConfig != null)
m_consolePort = (uint)networkConfig.GetInt("console_port", 0); m_consolePort = (uint)networkConfig.GetInt("console_port", 0);
m_timedScript = startupConfig.GetString("timer_Script", "disabled"); m_timedScript = startupConfig.GetString("timer_Script", "disabled");
if (m_logFileAppender != null) if (m_logFileAppender != null)
{ {
if (m_logFileAppender is log4net.Appender.FileAppender) if (m_logFileAppender is log4net.Appender.FileAppender)
@ -109,7 +111,7 @@ namespace OpenSim
Util.FireAndForgetMethod = asyncCallMethod; Util.FireAndForgetMethod = asyncCallMethod;
stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 15); 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) if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)
@ -830,9 +832,10 @@ namespace OpenSim
{ {
MainConsole.Instance.Output("Usage: change region <region name>"); MainConsole.Instance.Output("Usage: change region <region name>");
} }
string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName); string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName);
MainConsole.Instance.Output(String.Format("Currently selected region is {0}", 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; m_console.ConsoleScene = m_sceneManager.CurrentScene;
} }

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

@ -136,7 +136,7 @@ namespace pCampBot
if (behaviourSwitches.Contains("g")) if (behaviourSwitches.Contains("g"))
behaviours.Add(new GrabbingBehaviour()); 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; // int newlen = len + botcount;
// for (int i = len; i < newlen; i++) // for (int i = len; i < newlen; i++)
// { // {
// startupBot(i, Config); // startupBot(Config);
// } // }
// } // }
/// <summary> /// <summary>
/// This starts up the bot and stores the thread for the bot in the thread array /// This starts up the bot and stores the thread for the bot in the thread array
/// </summary> /// </summary>
/// <param name="pos">The position in the thread array to stick the bot's thread</param>
/// <param name="bm"></param> /// <param name="bm"></param>
/// <param name="behaviours">Behaviours for this bot to perform.</param> /// <param name="behaviours">Behaviours for this bot to perform.</param>
/// <param name="firstName">First name</param> /// <param name="firstName">First name</param>
/// <param name="lastName">Last name</param> /// <param name="lastName">Last name</param>
/// <param name="password">Password</param> /// <param name="password">Password</param>
/// <param name="loginUri">Login URI</param> /// <param name="loginUri">Login URI</param>
public void startupBot( public void StartBot(
int pos, BotManager bm, List<IBehaviour> behaviours, BotManager bm, List<IBehaviour> behaviours,
string firstName, string lastName, string password, string loginUri) string firstName, string lastName, string password, string loginUri)
{ {
Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri); Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri);
@ -234,8 +233,11 @@ namespace pCampBot
private void HandleShutdown(string module, string[] cmd) private void HandleShutdown(string module, string[] cmd)
{ {
m_log.Warn("[BOTMANAGER]: Shutting down bots"); Util.FireAndForget(o =>
doBotShutdown(); {
m_log.Warn("[BOTMANAGER]: Shutting down bots");
doBotShutdown();
});
} }
private void HandleShowStatus(string module, string[] cmd) private void HandleShowStatus(string module, string[] cmd)