diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 9fe284f..51312df 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -460,7 +460,7 @@ namespace OpenSim | |||
460 | if (alert != null) | 460 | if (alert != null) |
461 | presence.ControllingClient.Kick(alert); | 461 | presence.ControllingClient.Kick(alert); |
462 | else | 462 | else |
463 | presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); | 463 | presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n"); |
464 | 464 | ||
465 | // ...and close on our side | 465 | // ...and close on our side |
466 | presence.Scene.IncomingCloseAgent(presence.UUID); | 466 | presence.Scene.IncomingCloseAgent(presence.UUID); |
@@ -1174,7 +1174,7 @@ namespace OpenSim | |||
1174 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); | 1174 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); |
1175 | } | 1175 | } |
1176 | } | 1176 | } |
1177 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); | 1177 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); |
1178 | } | 1178 | } |
1179 | else | 1179 | else |
1180 | { | 1180 | { |