aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rwxr-xr-xOpenSim/Region/Application/OpenSim.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index a86a831..05e283e 100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -190,6 +190,8 @@ namespace OpenSim
190 190
191 PrintFileToConsole("startuplogo.txt"); 191 PrintFileToConsole("startuplogo.txt");
192 192
193 m_log.InfoFormat("[NETWORK]: Using {0} as SYSTEMIP", Util.GetLocalHost().ToString());
194
193 // For now, start at the 'root' level by default 195 // For now, start at the 'root' level by default
194 if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it 196 if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it
195 ChangeSelectedRegion("region", 197 ChangeSelectedRegion("region",
@@ -367,7 +369,6 @@ namespace OpenSim
367 m_console.Commands.AddCommand("hypergrid", false, "unlink-region", 369 m_console.Commands.AddCommand("hypergrid", false, "unlink-region",
368 "unlink-region <local name> or <HostName>:<HttpPort> <cr>", 370 "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
369 "Unlink a hypergrid region", RunCommand); 371 "Unlink a hypergrid region", RunCommand);
370
371 } 372 }
372 373
373 public override void ShutdownSpecific() 374 public override void ShutdownSpecific()
@@ -433,7 +434,7 @@ namespace OpenSim
433 // kick client... 434 // kick client...
434 if (alert != null) 435 if (alert != null)
435 presence.ControllingClient.Kick(alert); 436 presence.ControllingClient.Kick(alert);
436 else 437 else
437 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 438 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
438 439
439 // ...and close on our side 440 // ...and close on our side
@@ -640,7 +641,6 @@ namespace OpenSim
640 } 641 }
641 } 642 }
642 643
643
644 /// <summary> 644 /// <summary>
645 /// Load, Unload, and list Region modules in use 645 /// Load, Unload, and list Region modules in use
646 /// </summary> 646 /// </summary>
@@ -972,7 +972,6 @@ namespace OpenSim
972 scene.RegionInfo.RegionLocX, 972 scene.RegionInfo.RegionLocX,
973 scene.RegionInfo.RegionLocY, 973 scene.RegionInfo.RegionLocY,
974 scene.RegionInfo.InternalEndPoint.Port)); 974 scene.RegionInfo.InternalEndPoint.Port));
975
976 }); 975 });
977 break; 976 break;
978 977
@@ -1097,7 +1096,7 @@ namespace OpenSim
1097 } 1096 }
1098 else 1097 else
1099 { 1098 {
1100 MainConsole.Instance.Output(string.Format("A user with the name {0} {1} already exists!", firstName, lastName)); 1099 MainConsole.Instance.Output(string.Format("A user with the name {0} {1} already exists!", firstName, lastName));
1101 } 1100 }
1102 } 1101 }
1103 1102