aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-11-10 20:54:44 +0000
committerMelanie2011-11-10 20:54:44 +0000
commit444b345cdf7d5a1bf13a66334fc3c8d7f39d9032 (patch)
treeb8b9287a273c3e38c78c049800e1804f05190b60
parentFix misaligned sit animation on scripted sit caused by the default sit (diff)
parentconvert tabs from commit 3758306 to spaces (diff)
downloadopensim-SC_OLD-444b345cdf7d5a1bf13a66334fc3c8d7f39d9032.zip
opensim-SC_OLD-444b345cdf7d5a1bf13a66334fc3c8d7f39d9032.tar.gz
opensim-SC_OLD-444b345cdf7d5a1bf13a66334fc3c8d7f39d9032.tar.bz2
opensim-SC_OLD-444b345cdf7d5a1bf13a66334fc3c8d7f39d9032.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-rw-r--r--OpenSim/Region/Application/OpenSim.cs9
-rw-r--r--OpenSim/Tools/pCampBot/BotManager.cs16
2 files changed, 15 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 52b19ea..9fe284f 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -56,7 +56,7 @@ namespace OpenSim
56 protected bool m_gui = false; 56 protected bool m_gui = false;
57 protected string m_consoleType = "local"; 57 protected string m_consoleType = "local";
58 protected uint m_consolePort = 0; 58 protected uint m_consolePort = 0;
59 protected string m_custom_prompt; 59 protected string m_custom_prompt;
60 60
61 private string m_timedScript = "disabled"; 61 private string m_timedScript = "disabled";
62 private Timer m_scriptTimer; 62 private Timer m_scriptTimer;
@@ -86,7 +86,9 @@ namespace OpenSim
86 86
87 if (networkConfig != null) 87 if (networkConfig != null)
88 m_consolePort = (uint)networkConfig.GetInt("console_port", 0); 88 m_consolePort = (uint)networkConfig.GetInt("console_port", 0);
89
89 m_timedScript = startupConfig.GetString("timer_Script", "disabled"); 90 m_timedScript = startupConfig.GetString("timer_Script", "disabled");
91
90 if (m_logFileAppender != null) 92 if (m_logFileAppender != null)
91 { 93 {
92 if (m_logFileAppender is log4net.Appender.FileAppender) 94 if (m_logFileAppender is log4net.Appender.FileAppender)
@@ -109,7 +111,7 @@ namespace OpenSim
109 Util.FireAndForgetMethod = asyncCallMethod; 111 Util.FireAndForgetMethod = asyncCallMethod;
110 112
111 stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 15); 113 stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 15);
112 m_custom_prompt = startupConfig.GetString("custom_prompt", "Region"); 114 m_custom_prompt = startupConfig.GetString("custom_prompt", "Region");
113 } 115 }
114 116
115 if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool) 117 if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)
@@ -830,9 +832,10 @@ namespace OpenSim
830 { 832 {
831 MainConsole.Instance.Output("Usage: change region <region name>"); 833 MainConsole.Instance.Output("Usage: change region <region name>");
832 } 834 }
835
833 string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName); 836 string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName);
834 MainConsole.Instance.Output(String.Format("Currently selected region is {0}", regionName)); 837 MainConsole.Instance.Output(String.Format("Currently selected region is {0}", regionName));
835 m_console.DefaultPrompt = String.Format("{0} ({1}) ", m_custom_prompt, regionName); 838 m_console.DefaultPrompt = String.Format("{0} ({1}) ", m_custom_prompt, regionName);
836 m_console.ConsoleScene = m_sceneManager.CurrentScene; 839 m_console.ConsoleScene = m_sceneManager.CurrentScene;
837 } 840 }
838 841
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)