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 39004d4..14f670d 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -453,7 +453,7 @@ namespace OpenSim | |||
453 | if (alert != null) | 453 | if (alert != null) |
454 | presence.ControllingClient.Kick(alert); | 454 | presence.ControllingClient.Kick(alert); |
455 | else | 455 | else |
456 | presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); | 456 | presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n"); |
457 | 457 | ||
458 | // ...and close on our side | 458 | // ...and close on our side |
459 | presence.Scene.IncomingCloseAgent(presence.UUID); | 459 | presence.Scene.IncomingCloseAgent(presence.UUID); |
@@ -1142,7 +1142,7 @@ namespace OpenSim | |||
1142 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); | 1142 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); |
1143 | } | 1143 | } |
1144 | } | 1144 | } |
1145 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); | 1145 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); |
1146 | } | 1146 | } |
1147 | else | 1147 | else |
1148 | { | 1148 | { |