diff options
author | Justin Clark-Casey (justincc) | 2011-11-10 21:04:12 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-10 21:04:12 +0000 |
commit | b990914ec4f945f986e9f1386260b32fae8a42ed (patch) | |
tree | 529e5a4b1c38c1c9a3b6e1a37643c0f2d80fdfb9 /OpenSim | |
parent | launch pCampbot shutdown console comand asynchronously (diff) | |
download | opensim-SC-b990914ec4f945f986e9f1386260b32fae8a42ed.zip opensim-SC-b990914ec4f945f986e9f1386260b32fae8a42ed.tar.gz opensim-SC-b990914ec4f945f986e9f1386260b32fae8a42ed.tar.bz2 opensim-SC-b990914ec4f945f986e9f1386260b32fae8a42ed.tar.xz |
convert tabs from commit 3758306 to spaces
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 9 |
1 files changed, 6 insertions, 3 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 | ||