diff options
author | Justin Clark-Casey (justincc) | 2012-01-31 23:06:48 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-01-31 23:06:48 +0000 |
commit | ac7cded080ff4db606c42f81b4d1f798fe7fa624 (patch) | |
tree | 2e7644ebbb6bc3a69338137f4e2909b268382fb4 /OpenSim/Region/CoreModules/World/Objects | |
parent | Implement "show object uuid <uuid>" console command. (diff) | |
download | opensim-SC-ac7cded080ff4db606c42f81b4d1f798fe7fa624.zip opensim-SC-ac7cded080ff4db606c42f81b4d1f798fe7fa624.tar.gz opensim-SC-ac7cded080ff4db606c42f81b4d1f798fe7fa624.tar.bz2 opensim-SC-ac7cded080ff4db606c42f81b4d1f798fe7fa624.tar.xz |
Get rid of the "no objects found" feedback for now - this doesn't work well if a command is executed over multiple scenes.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Objects')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs index b378f7a..d5a3e77 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | |||
@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
141 | 141 | ||
142 | if (sop == null) | 142 | if (sop == null) |
143 | { | 143 | { |
144 | m_console.OutputFormat("No object found with uuid {0}", objectUuid); | 144 | // m_console.OutputFormat("No object found with uuid {0}", objectUuid); |
145 | return; | 145 | return; |
146 | } | 146 | } |
147 | 147 | ||
@@ -191,8 +191,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
191 | deletes.Add(g); | 191 | deletes.Add(g); |
192 | }); | 192 | }); |
193 | 193 | ||
194 | if (deletes.Count == 0) | 194 | // if (deletes.Count == 0) |
195 | m_console.OutputFormat("No objects were found with owner {0}", match); | 195 | // m_console.OutputFormat("No objects were found with owner {0}", match); |
196 | 196 | ||
197 | break; | 197 | break; |
198 | 198 | ||
@@ -206,8 +206,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
206 | deletes.Add(g); | 206 | deletes.Add(g); |
207 | }); | 207 | }); |
208 | 208 | ||
209 | if (deletes.Count == 0) | 209 | // if (deletes.Count == 0) |
210 | m_console.OutputFormat("No objects were found with creator {0}", match); | 210 | // m_console.OutputFormat("No objects were found with creator {0}", match); |
211 | 211 | ||
212 | break; | 212 | break; |
213 | 213 | ||
@@ -221,8 +221,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
221 | deletes.Add(g); | 221 | deletes.Add(g); |
222 | }); | 222 | }); |
223 | 223 | ||
224 | if (deletes.Count == 0) | 224 | // if (deletes.Count == 0) |
225 | m_console.OutputFormat("No objects were found with uuid {0}", match); | 225 | // m_console.OutputFormat("No objects were found with uuid {0}", match); |
226 | 226 | ||
227 | break; | 227 | break; |
228 | 228 | ||
@@ -233,8 +233,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
233 | deletes.Add(g); | 233 | deletes.Add(g); |
234 | }); | 234 | }); |
235 | 235 | ||
236 | if (deletes.Count == 0) | 236 | // if (deletes.Count == 0) |
237 | m_console.OutputFormat("No objects were found with name {0}", o); | 237 | // m_console.OutputFormat("No objects were found with name {0}", o); |
238 | 238 | ||
239 | break; | 239 | break; |
240 | 240 | ||
@@ -261,12 +261,14 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
261 | deletes.Add(g); | 261 | deletes.Add(g); |
262 | }); | 262 | }); |
263 | 263 | ||
264 | if (deletes.Count == 0) | 264 | // if (deletes.Count == 0) |
265 | m_console.OutputFormat("No objects were found outside region bounds"); | 265 | // m_console.OutputFormat("No objects were found outside region bounds"); |
266 | 266 | ||
267 | break; | 267 | break; |
268 | } | 268 | } |
269 | 269 | ||
270 | m_console.OutputFormat("Deleting {0} objects in {1}", deletes.Count, m_scene.RegionInfo.RegionName); | ||
271 | |||
270 | foreach (SceneObjectGroup g in deletes) | 272 | foreach (SceneObjectGroup g in deletes) |
271 | { | 273 | { |
272 | m_console.OutputFormat("Deleting object {0} {1}", g.UUID, g.Name); | 274 | m_console.OutputFormat("Deleting object {0} {1}", g.UUID, g.Name); |