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

* refactor: clean up code for selecting regions on the region console

0.6.0-stable
Justin Clarke Casey 2008-08-05 17:00:35 +00:00
parent 07019c6a84
commit 1da9902294
1 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ namespace OpenSim
m_log.Info("===================================================================="); m_log.Info("====================================================================");
m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (m_sandbox ? "sandbox" : "grid")); m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (m_sandbox ? "sandbox" : "grid"));
m_console = CreateConsole(); m_console = new ConsoleBase("Region", this);
MainConsole.Instance = m_console; MainConsole.Instance = m_console;
base.Startup(); base.Startup();
@ -116,12 +116,6 @@ namespace OpenSim
PrintFileToConsole("startuplogo.txt"); PrintFileToConsole("startuplogo.txt");
RegisterCmd("echoTest", RunEchoTest, "this echos your command args to see how they are parsed"); RegisterCmd("echoTest", RunEchoTest, "this echos your command args to see how they are parsed");
RegisterCmd("kickuser", KickUserCommand, "kickuser [first] [last] - attempts to log off a user from any region we are serving"); RegisterCmd("kickuser", KickUserCommand, "kickuser [first] [last] - attempts to log off a user from any region we are serving");
}
protected ConsoleBase CreateConsole()
{
return new ConsoleBase("Region", this);
} }
private void RunAutoTimerScript(object sender, EventArgs e) private void RunAutoTimerScript(object sender, EventArgs e)
@ -132,13 +126,16 @@ namespace OpenSim
} }
} }
private string GetActualSimName() /// <summary>
/// Get the name of the region which is currently selected for single region operations
/// </summary>
/// <returns></returns>
private string GetSelectedRegionName()
{ {
if (m_sceneManager.CurrentScene == null) return "Root"; if (m_sceneManager.CurrentScene == null) return "Root";
return m_sceneManager.CurrentScene.RegionInfo.RegionName; return m_sceneManager.CurrentScene.RegionInfo.RegionName;
} }
#region Console Commands #region Console Commands
private void RunEchoTest(string[] cmdparams) private void RunEchoTest(string[] cmdparams)
@ -291,9 +288,8 @@ namespace OpenSim
m_console.Notice("create user - adds a new user."); m_console.Notice("create user - adds a new user.");
} }
m_console.Notice(""); m_console.Notice("");
m_console.Notice("Serving region " + GetActualSimName()); m_console.Notice("Selected region: " + GetSelectedRegionName());
m_console.Notice(""); m_console.Notice("");
break; break;
@ -386,26 +382,7 @@ namespace OpenSim
break; break;
case "change-region": case "change-region":
if (cmdparams.Length > 0) ChangeWorkingRegion(cmdparams);
{
string regionName = CombineParams(cmdparams, 0);
if (!m_sceneManager.TrySetCurrentScene(regionName))
{
m_console.Error("Couldn't set current region to: " + regionName);
}
}
if (m_sceneManager.CurrentScene == null)
{
m_console.Error("CONSOLE", "Currently at Root level. To change region please use 'change-region <regioname>'");
}
else
{
m_console.Error("CONSOLE", "Current Region: " + m_sceneManager.CurrentScene.RegionInfo.RegionName +
". To change region please use 'change-region <region name>'");
}
break; break;
case "export-map": case "export-map":
@ -531,6 +508,25 @@ namespace OpenSim
} }
} }
/// <summary>
/// Change the current working region. The working region is that operated upon by single region commands.
/// </summary>
/// <param name="cmdParams"></param>
protected void ChangeWorkingRegion(string[] cmdparams)
{
if (cmdparams.Length > 0)
{
string regionName = CombineParams(cmdparams, 0);
if (!m_sceneManager.TrySetCurrentScene(regionName))
{
m_console.Error("Couldn't set current region to: " + regionName);
}
}
m_console.Notice("CONSOLE", "Selected region: " + GetSelectedRegionName());
}
/// <summary> /// <summary>
/// Execute switch for some of the create commands /// Execute switch for some of the create commands
/// </summary> /// </summary>
@ -674,8 +670,9 @@ namespace OpenSim
}); });
break; break;
} }
m_console.Notice(""); m_console.Notice("");
m_console.Notice("Serving region " + GetActualSimName()); m_console.Notice("Selected region: " + GetSelectedRegionName());
m_console.Notice(""); m_console.Notice("");
} }