aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs36
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index d961b73..a90c078 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -65,7 +65,7 @@ namespace OpenSim
65 65
66 protected List<UDPServer> m_udpServers = new List<UDPServer>(); 66 protected List<UDPServer> m_udpServers = new List<UDPServer>();
67 protected List<RegionInfo> m_regionData = new List<RegionInfo>(); 67 protected List<RegionInfo> m_regionData = new List<RegionInfo>();
68 protected List<IWorld> m_localWorld = new List<IWorld>(); 68 protected List<IScene> m_localScenes = new List<IScene>();
69 69
70 private bool m_silent; 70 private bool m_silent;
71 private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log"; 71 private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log";
@@ -83,7 +83,7 @@ namespace OpenSim
83 83
84 84
85 /// <summary> 85 /// <summary>
86 /// Performs initialisation of the world, such as loading configuration from disk. 86 /// Performs initialisation of the scene, such as loading configuration from disk.
87 /// </summary> 87 /// </summary>
88 public override void StartUp() 88 public override void StartUp()
89 { 89 {
@@ -126,7 +126,7 @@ namespace OpenSim
126 UDPServer udpServer; 126 UDPServer udpServer;
127 Scene scene = SetupScene(regionInfo, out udpServer); 127 Scene scene = SetupScene(regionInfo, out udpServer);
128 128
129 m_localWorld.Add(scene); 129 m_localScenes.Add(scene);
130 130
131 131
132 m_udpServers.Add(udpServer); 132 m_udpServers.Add(udpServer);
@@ -311,9 +311,9 @@ namespace OpenSim
311 m_log.Verbose("Main.cs:Shutdown() - Killing clients"); 311 m_log.Verbose("Main.cs:Shutdown() - Killing clients");
312 // IMPLEMENT THIS 312 // IMPLEMENT THIS
313 m_log.Verbose("Main.cs:Shutdown() - Closing console and terminating"); 313 m_log.Verbose("Main.cs:Shutdown() - Closing console and terminating");
314 for (int i = 0; i < m_localWorld.Count; i++) 314 for (int i = 0; i < m_localScenes.Count; i++)
315 { 315 {
316 ((Scene)m_localWorld[i]).Close(); 316 ((Scene)m_localScenes[i]).Close();
317 } 317 }
318 m_log.Close(); 318 m_log.Close();
319 Environment.Exit(0); 319 Environment.Exit(0);
@@ -343,32 +343,32 @@ namespace OpenSim
343 343
344 case "terrain": 344 case "terrain":
345 string result = ""; 345 string result = "";
346 for (int i = 0; i < m_localWorld.Count; i++) 346 for (int i = 0; i < m_localScenes.Count; i++)
347 { 347 {
348 if (!((Scene)m_localWorld[i]).Terrain.RunTerrainCmd(cmdparams, ref result, m_localWorld[i].RegionInfo.RegionName)) 348 if (!((Scene)m_localScenes[i]).Terrain.RunTerrainCmd(cmdparams, ref result, m_localScenes[i].RegionInfo.RegionName))
349 { 349 {
350 m_log.Error(result); 350 m_log.Error(result);
351 } 351 }
352 } 352 }
353 break; 353 break;
354 case "script": 354 case "script":
355 for (int i = 0; i < m_localWorld.Count; i++) 355 for (int i = 0; i < m_localScenes.Count; i++)
356 { 356 {
357 ((Scene)m_localWorld[i]).SendCommandToScripts(cmdparams); 357 ((Scene)m_localScenes[i]).SendCommandToScripts(cmdparams);
358 } 358 }
359 break; 359 break;
360 360
361 case "backup": 361 case "backup":
362 for (int i = 0; i < m_localWorld.Count; i++) 362 for (int i = 0; i < m_localScenes.Count; i++)
363 { 363 {
364 ((Scene)m_localWorld[i]).Backup(); 364 ((Scene)m_localScenes[i]).Backup();
365 } 365 }
366 break; 366 break;
367 367
368 case "alert": 368 case "alert":
369 for (int i = 0; i < m_localWorld.Count; i++) 369 for (int i = 0; i < m_localScenes.Count; i++)
370 { 370 {
371 ((Scene)m_localWorld[i]).HandleAlertCommand(cmdparams); 371 ((Scene)m_localScenes[i]).HandleAlertCommand(cmdparams);
372 } 372 }
373 break; 373 break;
374 374
@@ -398,14 +398,14 @@ namespace OpenSim
398 case "users": 398 case "users":
399 ScenePresence TempAv; 399 ScenePresence TempAv;
400 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")); 400 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"));
401 for (int i = 0; i < m_localWorld.Count; i++) 401 for (int i = 0; i < m_localScenes.Count; i++)
402 { 402 {
403 foreach (libsecondlife.LLUUID UUID in ((Scene)m_localWorld[i]).Entities.Keys) 403 foreach (libsecondlife.LLUUID UUID in ((Scene)m_localScenes[i]).Entities.Keys)
404 { 404 {
405 if (((Scene)m_localWorld[i]).Entities[UUID].ToString() == "OpenSim.world.Avatar") 405 if (((Scene)m_localScenes[i]).Entities[UUID].ToString() == "OpenSim.world.Avatar")
406 { 406 {
407 TempAv = (ScenePresence)((Scene)m_localWorld[i]).Entities[UUID]; 407 TempAv = (ScenePresence)((Scene)m_localScenes[i]).Entities[UUID];
408 m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.AgentId, "Unknown", "Unknown"), ((Scene)m_localWorld[i]).RegionInfo.RegionName); 408 m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.AgentId, "Unknown", "Unknown"), ((Scene)m_localScenes[i]).RegionInfo.RegionName);
409 } 409 }
410 } 410 }
411 } 411 }