aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-19 00:27:17 +0000
committerJustin Clark-Casey (justincc)2013-01-25 23:52:36 +0000
commitc42bff538873ae5b59523463f06526990480b2fd (patch)
treef10fa9cec58382e8b04f32e9e9f7094e515a71dd /OpenSim/Region
parentAdd "debug set set animations true|false" region console command. (diff)
downloadopensim-SC_OLD-c42bff538873ae5b59523463f06526990480b2fd.zip
opensim-SC_OLD-c42bff538873ae5b59523463f06526990480b2fd.tar.gz
opensim-SC_OLD-c42bff538873ae5b59523463f06526990480b2fd.tar.bz2
opensim-SC_OLD-c42bff538873ae5b59523463f06526990480b2fd.tar.xz
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.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs27
1 files changed, 12 insertions, 15 deletions
diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
index 521141a..12169ab 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
122 { 122 {
123 if (args.Length == 3) 123 if (args.Length == 3)
124 { 124 {
125 if (MainConsole.Instance.ConsoleScene == null) 125 if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
126 MainConsole.Instance.Output("Please use 'change region <regioname>' first"); 126 return;
127 else 127
128 OutputSceneDebugOptions(); 128 OutputSceneDebugOptions();
129 } 129 }
130 else 130 else
131 { 131 {
@@ -144,6 +144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
144 cdl.AddRow("teleport", m_scene.DebugTeleporting); 144 cdl.AddRow("teleport", m_scene.DebugTeleporting);
145 cdl.AddRow("updates", m_scene.DebugUpdates); 145 cdl.AddRow("updates", m_scene.DebugUpdates);
146 146
147 MainConsole.Instance.OutputFormat("Scene {0} options:", m_scene.Name);
147 MainConsole.Instance.Output(cdl.ToString()); 148 MainConsole.Instance.Output(cdl.ToString());
148 } 149 }
149 150
@@ -151,18 +152,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
151 { 152 {
152 if (args.Length == 5) 153 if (args.Length == 5)
153 { 154 {
154 if (MainConsole.Instance.ConsoleScene == null) 155 if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
155 { 156 return;
156 MainConsole.Instance.Output("Please use 'change region <regioname>' first");
157 }
158 else
159 {
160 string key = args[3];
161 string value = args[4];
162 SetSceneDebugOptions(new Dictionary<string, string>() { { key, value } });
163 157
164 MainConsole.Instance.OutputFormat("Set debug scene {0} = {1}", key, value); 158 string key = args[3];
165 } 159 string value = args[4];
160 SetSceneDebugOptions(new Dictionary<string, string>() { { key, value } });
161
162 MainConsole.Instance.OutputFormat("Set {0} debug scene {1} = {2}", m_scene.Name, key, value);
166 } 163 }
167 else 164 else
168 { 165 {