From 652cfa2ee2ce54c4b53fc4001a715406d66c3cf1 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Sat, 19 Jan 2013 00:27:17 +0000
Subject: [PATCH] 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.

---
 .../SceneCommands/SceneCommandsModule.cs      | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
index 521141a851..12169ab617 100644
--- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
@@ -122,10 +122,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
         {
             if (args.Length == 3)
             {
-                if (MainConsole.Instance.ConsoleScene == null)
-                    MainConsole.Instance.Output("Please use 'change region <regioname>' first");
-                else
-                    OutputSceneDebugOptions();
+                if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
+                    return;
+
+                OutputSceneDebugOptions();
             }
             else
             {
@@ -144,6 +144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
             cdl.AddRow("teleport", m_scene.DebugTeleporting);
             cdl.AddRow("updates", m_scene.DebugUpdates);
 
+            MainConsole.Instance.OutputFormat("Scene {0} options:", m_scene.Name);
             MainConsole.Instance.Output(cdl.ToString());
         }
 
@@ -151,18 +152,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
         {
             if (args.Length == 5)
             {
-                if (MainConsole.Instance.ConsoleScene == null)
-                {
-                    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 } });
+                if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
+                    return;
 
-                    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
             {