aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-02-16 19:08:06 +0000
committerJustin Clark-Casey (justincc)2010-02-16 19:08:06 +0000
commit4c90ee29432539efbf5942010dd574822235ed57 (patch)
treed159f72df97dfef5719221301009e90f375f2ef2 /OpenSim/Region/Application/OpenSim.cs
parentminor: Make SOG.DelinkFromGroup() return the newly delinked scene object inst... (diff)
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.zip
opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.gz
opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.bz2
opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rwxr-xr-xOpenSim/Region/Application/OpenSim.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index a86a831..96eceb0 100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -367,7 +367,6 @@ namespace OpenSim
367 m_console.Commands.AddCommand("hypergrid", false, "unlink-region", 367 m_console.Commands.AddCommand("hypergrid", false, "unlink-region",
368 "unlink-region <local name> or <HostName>:<HttpPort> <cr>", 368 "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
369 "Unlink a hypergrid region", RunCommand); 369 "Unlink a hypergrid region", RunCommand);
370
371 } 370 }
372 371
373 public override void ShutdownSpecific() 372 public override void ShutdownSpecific()
@@ -433,7 +432,7 @@ namespace OpenSim
433 // kick client... 432 // kick client...
434 if (alert != null) 433 if (alert != null)
435 presence.ControllingClient.Kick(alert); 434 presence.ControllingClient.Kick(alert);
436 else 435 else
437 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 436 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
438 437
439 // ...and close on our side 438 // ...and close on our side
@@ -640,7 +639,6 @@ namespace OpenSim
640 } 639 }
641 } 640 }
642 641
643
644 /// <summary> 642 /// <summary>
645 /// Load, Unload, and list Region modules in use 643 /// Load, Unload, and list Region modules in use
646 /// </summary> 644 /// </summary>
@@ -972,7 +970,6 @@ namespace OpenSim
972 scene.RegionInfo.RegionLocX, 970 scene.RegionInfo.RegionLocX,
973 scene.RegionInfo.RegionLocY, 971 scene.RegionInfo.RegionLocY,
974 scene.RegionInfo.InternalEndPoint.Port)); 972 scene.RegionInfo.InternalEndPoint.Port));
975
976 }); 973 });
977 break; 974 break;
978 975
@@ -1097,7 +1094,7 @@ namespace OpenSim
1097 } 1094 }
1098 else 1095 else
1099 { 1096 {
1100 MainConsole.Instance.Output(string.Format("A user with the name {0} {1} already exists!", firstName, lastName)); 1097 MainConsole.Instance.Output(string.Format("A user with the name {0} {1} already exists!", firstName, lastName));
1101 } 1098 }
1102 } 1099 }
1103 1100