aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-05 01:46:28 +0100
committerJustin Clark-Casey (justincc)2012-10-05 01:46:28 +0100
commit046113c137db67f1ded44e0093762c4805283b12 (patch)
tree145b663eb93ea8aa11bc7edf64a700b8687cc5b4
parentForgot to actually remove the packetpool set code from scene. (diff)
downloadopensim-SC_OLD-046113c137db67f1ded44e0093762c4805283b12.zip
opensim-SC_OLD-046113c137db67f1ded44e0093762c4805283b12.tar.gz
opensim-SC_OLD-046113c137db67f1ded44e0093762c4805283b12.tar.bz2
opensim-SC_OLD-046113c137db67f1ded44e0093762c4805283b12.tar.xz
Print number of objects found with "show object name" and "show part name" simulator console commands
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs16
1 files changed, 4 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index 09f6758..e96dc3e 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -215,12 +215,6 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
215 215
216 m_scene.ForEachSOG(searchAction); 216 m_scene.ForEachSOG(searchAction);
217 217
218 if (sceneObjects.Count == 0)
219 {
220 m_console.OutputFormat("No objects with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
221 return;
222 }
223
224 StringBuilder sb = new StringBuilder(); 218 StringBuilder sb = new StringBuilder();
225 219
226 foreach (SceneObjectGroup so in sceneObjects) 220 foreach (SceneObjectGroup so in sceneObjects)
@@ -229,6 +223,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
229 sb.Append("\n"); 223 sb.Append("\n");
230 } 224 }
231 225
226 sb.AppendFormat("{0} objects found in {1}\n", sceneObjects.Count, m_scene.Name);
227
232 m_console.OutputFormat(sb.ToString()); 228 m_console.OutputFormat(sb.ToString());
233 } 229 }
234 230
@@ -298,12 +294,6 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
298 294
299 m_scene.ForEachSOG(searchAction); 295 m_scene.ForEachSOG(searchAction);
300 296
301 if (parts.Count == 0)
302 {
303 m_console.OutputFormat("No parts with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
304 return;
305 }
306
307 StringBuilder sb = new StringBuilder(); 297 StringBuilder sb = new StringBuilder();
308 298
309 foreach (SceneObjectPart part in parts) 299 foreach (SceneObjectPart part in parts)
@@ -312,6 +302,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
312 sb.Append("\n"); 302 sb.Append("\n");
313 } 303 }
314 304
305 sb.AppendFormat("{0} parts found in {1}\n", parts.Count, m_scene.Name);
306
315 m_console.OutputFormat(sb.ToString()); 307 m_console.OutputFormat(sb.ToString());
316 } 308 }
317 309