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

* Make currently selected region appear in the region console prompt 

* This region is used for single region commands (such as save-xml2)
0.6.0-stable
Justin Clarke Casey 2008-08-05 17:28:23 +00:00
parent 32486dcaf5
commit f2c456c23d
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Framework/Console/ConsoleBase.cs
View File

@ -46,7 +46,12 @@ namespace OpenSim.Framework.Console
/// <summary> /// <summary>
/// The default prompt text. /// The default prompt text.
/// </summary> /// </summary>
public string m_defaultPrompt; public string DefaultPrompt
{
set { m_defaultPrompt = value + "# "; }
get { return m_defaultPrompt; }
}
protected string m_defaultPrompt;
/// <summary> /// <summary>
/// Constructor. /// Constructor.
@ -55,7 +60,7 @@ namespace OpenSim.Framework.Console
/// <param name="cmdparser"></param> /// <param name="cmdparser"></param>
public ConsoleBase(string defaultPrompt, conscmd_callback cmdparser) public ConsoleBase(string defaultPrompt, conscmd_callback cmdparser)
{ {
m_defaultPrompt = defaultPrompt + "# "; DefaultPrompt = defaultPrompt;
m_cmdParser = cmdparser; m_cmdParser = cmdparser;
} }

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

@ -92,6 +92,9 @@ namespace OpenSim
m_console = new ConsoleBase("Region", this); m_console = new ConsoleBase("Region", this);
MainConsole.Instance = m_console; MainConsole.Instance = m_console;
// For now, start at the 'root' level by default
ChangeSelectedRegion(new string[] {"root"});
base.Startup(); base.Startup();
//Run Startup Commands //Run Startup Commands
@ -520,11 +523,11 @@ namespace OpenSim
if (!m_sceneManager.TrySetCurrentScene(regionName)) if (!m_sceneManager.TrySetCurrentScene(regionName))
{ {
m_console.Error("Couldn't set current region to: " + regionName); m_console.Error("CONSOLE", "Couldn't set current region to: " + regionName);
} }
} }
m_console.Notice("CONSOLE", "Selected region: " + GetSelectedRegionName()); m_console.DefaultPrompt = String.Format("Region ({0}) ", GetSelectedRegionName());
} }
/// <summary> /// <summary>

3
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -138,9 +138,6 @@ namespace OpenSim
get { return m_httpServer; } get { return m_httpServer; }
} }
// 6/28 Cfk: Commented out the new in this next line. It used to be
// 6/28 cfk: public new uint HttpServerPort and it was causing a warning indicating there should not be a new
// 6/28 cfk: There is still a new in the declaration above and it is unclear if it should be there or not.
public uint HttpServerPort public uint HttpServerPort
{ {
get { return m_httpServerPort; } get { return m_httpServerPort; }