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

Fix use of scene debug commands when region is set to root or a specific region where there is more than one region on the simulator.

0.7.4-extended
Justin Clark-Casey (justincc) 2013-01-19 00:27:17 +00:00
parent af99e5e74a
commit 39b8f339ce
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
View File

@ -122,10 +122,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
{ {
if (args.Length == 3) if (args.Length == 3)
{ {
if (MainConsole.Instance.ConsoleScene == null) if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
MainConsole.Instance.Output("Please use 'change region <regioname>' first"); return;
else
OutputSceneDebugOptions(); OutputSceneDebugOptions();
} }
else else
{ {
@ -144,6 +144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
cdl.AddRow("teleport", m_scene.DebugTeleporting); cdl.AddRow("teleport", m_scene.DebugTeleporting);
cdl.AddRow("updates", m_scene.DebugUpdates); cdl.AddRow("updates", m_scene.DebugUpdates);
MainConsole.Instance.OutputFormat("Scene {0} options:", m_scene.Name);
MainConsole.Instance.Output(cdl.ToString()); MainConsole.Instance.Output(cdl.ToString());
} }
@ -151,18 +152,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
{ {
if (args.Length == 5) if (args.Length == 5)
{ {
if (MainConsole.Instance.ConsoleScene == null) if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
{ return;
MainConsole.Instance.Output("Please use 'change region <regioname>' first");
}
else
{
string key = args[3];
string value = args[4];
SetSceneDebugOptions(new Dictionary<string, string>() { { key, value } });
MainConsole.Instance.OutputFormat("Set debug scene {0} = {1}", key, value); string key = args[3];
} string value = args[4];
SetSceneDebugOptions(new Dictionary<string, string>() { { key, value } });
MainConsole.Instance.OutputFormat("Set {0} debug scene {1} = {2}", m_scene.Name, key, value);
} }
else else
{ {