diff options
author | lbsa71 | 2007-08-06 14:14:43 +0000 |
---|---|---|
committer | lbsa71 | 2007-08-06 14:14:43 +0000 |
commit | fdbb89165975b81f768896cdd514ebe3932a283b (patch) | |
tree | bf41dfa61fb824209a279b48cff98f3048805ace /OpenSim/Region/Application/OpenSimMain.cs | |
parent | * renamed some scene to world (diff) | |
download | opensim-SC_OLD-fdbb89165975b81f768896cdd514ebe3932a283b.zip opensim-SC_OLD-fdbb89165975b81f768896cdd514ebe3932a283b.tar.gz opensim-SC_OLD-fdbb89165975b81f768896cdd514ebe3932a283b.tar.bz2 opensim-SC_OLD-fdbb89165975b81f768896cdd514ebe3932a283b.tar.xz |
* commands are done foreach instead of by [i]
* fixed 'show users' format bug.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index cf3ed85..e57ba27 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -277,32 +277,32 @@ namespace OpenSim | |||
277 | 277 | ||
278 | case "terrain": | 278 | case "terrain": |
279 | string result = ""; | 279 | string result = ""; |
280 | for (int i = 0; i < m_localScenes.Count; i++) | 280 | foreach(Scene scene in m_localScenes) |
281 | { | 281 | { |
282 | if (!((Scene)m_localScenes[i]).Terrain.RunTerrainCmd(cmdparams, ref result, m_localScenes[i].RegionInfo.RegionName)) | 282 | if (!scene.Terrain.RunTerrainCmd(cmdparams, ref result, scene.RegionInfo.RegionName)) |
283 | { | 283 | { |
284 | m_log.Error(result); | 284 | m_log.Error(result); |
285 | } | 285 | } |
286 | } | 286 | } |
287 | break; | 287 | break; |
288 | case "script": | 288 | case "script": |
289 | for (int i = 0; i < m_localScenes.Count; i++) | 289 | foreach(Scene scene in m_localScenes ) |
290 | { | 290 | { |
291 | ((Scene)m_localScenes[i]).SendCommandToScripts(cmdparams); | 291 | scene.SendCommandToScripts(cmdparams); |
292 | } | 292 | } |
293 | break; | 293 | break; |
294 | 294 | ||
295 | case "backup": | 295 | case "backup": |
296 | for (int i = 0; i < m_localScenes.Count; i++) | 296 | foreach(Scene scene in m_localScenes ) |
297 | { | 297 | { |
298 | ((Scene)m_localScenes[i]).Backup(); | 298 | scene.Backup(); |
299 | } | 299 | } |
300 | break; | 300 | break; |
301 | 301 | ||
302 | case "alert": | 302 | case "alert": |
303 | for (int i = 0; i < m_localScenes.Count; i++) | 303 | foreach(Scene scene in m_localScenes) |
304 | { | 304 | { |
305 | ((Scene)m_localScenes[i]).HandleAlertCommand(cmdparams); | 305 | scene.HandleAlertCommand(cmdparams); |
306 | } | 306 | } |
307 | break; | 307 | break; |
308 | 308 | ||
@@ -333,12 +333,21 @@ namespace OpenSim | |||
333 | m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP", "World")); | 333 | m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP", "World")); |
334 | for (int i = 0; i < m_localScenes.Count; i++) | 334 | for (int i = 0; i < m_localScenes.Count; i++) |
335 | { | 335 | { |
336 | foreach (Entity entity in m_localScenes[i].Entities.Values ) | 336 | Scene scene = m_localScenes[i]; |
337 | foreach (Entity entity in scene.Entities.Values ) | ||
337 | { | 338 | { |
338 | if ( entity is ScenePresence ) | 339 | if ( entity is ScenePresence ) |
339 | { | 340 | { |
340 | ScenePresence scenePrescence = entity as ScenePresence; | 341 | ScenePresence scenePrescence = entity as ScenePresence; |
341 | m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", scenePrescence.Firstname, scenePrescence.Lastname, scenePrescence.UUID, scenePrescence.ControllingClient.AgentId, "Unknown", "Unknown"), ((Scene)m_localScenes[i]).RegionInfo.RegionName); | 342 | m_log.Error( |
343 | String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", | ||
344 | scenePrescence.Firstname, | ||
345 | scenePrescence.Lastname, | ||
346 | scenePrescence.UUID, | ||
347 | scenePrescence.ControllingClient.AgentId, | ||
348 | "Unknown", | ||
349 | "Unknown", | ||
350 | scene.RegionInfo.RegionName)); | ||
342 | } | 351 | } |
343 | } | 352 | } |
344 | } | 353 | } |