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 ec1fb04..3f4ee59 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -448,7 +448,7 @@ namespace OpenSim | |||
448 | if (alert != null) | 448 | if (alert != null) |
449 | presence.ControllingClient.Kick(alert); | 449 | presence.ControllingClient.Kick(alert); |
450 | else | 450 | else |
451 | presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); | 451 | presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n"); |
452 | 452 | ||
453 | // ...and close on our side | 453 | // ...and close on our side |
454 | presence.Scene.IncomingCloseAgent(presence.UUID); | 454 | presence.Scene.IncomingCloseAgent(presence.UUID); |
@@ -1134,7 +1134,7 @@ namespace OpenSim | |||
1134 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); | 1134 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); |
1135 | } | 1135 | } |
1136 | } | 1136 | } |
1137 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); | 1137 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); |
1138 | } | 1138 | } |
1139 | else | 1139 | else |
1140 | { | 1140 | { |