diff options
author | Diva Canto | 2012-03-16 13:08:27 -0700 |
---|---|---|
committer | Diva Canto | 2012-03-16 13:08:27 -0700 |
commit | a4dca88a5718b8594177314a289eae84f2ac585e (patch) | |
tree | 2bb177ddbff71330ca02cd1abb6ba48ceb184e8a /OpenSim/Region | |
parent | Terrain: added [Terrain] section with an option to load an initial flat terra... (diff) | |
parent | minor: reuse threadpool count we just fetched instead of fetching it again (diff) | |
download | opensim-SC-a4dca88a5718b8594177314a289eae84f2ac585e.zip opensim-SC-a4dca88a5718b8594177314a289eae84f2ac585e.tar.gz opensim-SC-a4dca88a5718b8594177314a289eae84f2ac585e.tar.bz2 opensim-SC-a4dca88a5718b8594177314a289eae84f2ac585e.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 3697f78..d4108d7 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -380,6 +380,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
380 | if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_Scene)) | 380 | if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_Scene)) |
381 | return; | 381 | return; |
382 | 382 | ||
383 | MainConsole.Instance.OutputFormat(GetStatusReport()); | ||
384 | } | ||
385 | |||
386 | public string GetStatusReport() | ||
387 | { | ||
383 | StringBuilder sb = new StringBuilder(); | 388 | StringBuilder sb = new StringBuilder(); |
384 | sb.AppendFormat("Status of XEngine instance for {0}\n", m_Scene.RegionInfo.RegionName); | 389 | sb.AppendFormat("Status of XEngine instance for {0}\n", m_Scene.RegionInfo.RegionName); |
385 | 390 | ||
@@ -407,7 +412,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
407 | Listener l = AsyncCommandManager.GetListenerPlugin(this); | 412 | Listener l = AsyncCommandManager.GetListenerPlugin(this); |
408 | sb.AppendFormat("Listeners : {0}\n", l.ListenerCount); | 413 | sb.AppendFormat("Listeners : {0}\n", l.ListenerCount); |
409 | 414 | ||
410 | MainConsole.Instance.OutputFormat(sb.ToString()); | 415 | return sb.ToString(); |
411 | } | 416 | } |
412 | 417 | ||
413 | public void HandleShowScripts(string module, string[] cmdparams) | 418 | public void HandleShowScripts(string module, string[] cmdparams) |