From 37583063eebb021784ce3b7d5aec75608c0cc27a Mon Sep 17 00:00:00 2001 From: GuduleLapointe Date: Fri, 28 Oct 2011 23:58:14 +0200 Subject: [PATCH] Allow custom setting for the console prompt Signed-off-by: BlueWall --- OpenSim/Region/Application/OpenSim.cs | 5 +++-- bin/OpenSim.ini.example | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 60c130f3a5..52b19eaafa 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -56,6 +56,7 @@ namespace OpenSim protected bool m_gui = false; protected string m_consoleType = "local"; protected uint m_consolePort = 0; + protected string m_custom_prompt; private string m_timedScript = "disabled"; private Timer m_scriptTimer; @@ -108,6 +109,7 @@ namespace OpenSim Util.FireAndForgetMethod = asyncCallMethod; stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 15); + m_custom_prompt = startupConfig.GetString("custom_prompt", "Region"); } if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool) @@ -828,10 +830,9 @@ namespace OpenSim { MainConsole.Instance.Output("Usage: change region "); } - 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("Region ({0}) ", regionName); + m_console.DefaultPrompt = String.Format("{0} ({1}) ", m_custom_prompt, regionName); m_console.ConsoleScene = m_sceneManager.CurrentScene; } diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index e71fb05e13..c5205dbeae 100755 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -230,6 +230,11 @@ ;; by scripts have changed. ; DeleteScriptsOnStartup = true + ;; Custom prompt + ;; This value replaces the word "Region" in console prompt + ;; (usualy "Region (regionName) # " + ;; Useful only if you have to monitor serveral servers + ; custom_prompt = "MyServer1" [SMTP] ;; The SMTP server enabled the email module to send email to external