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 145875b..7a40751 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -484,7 +484,7 @@ namespace OpenSim | |||
484 | if (alert != null) | 484 | if (alert != null) |
485 | presence.ControllingClient.Kick(alert); | 485 | presence.ControllingClient.Kick(alert); |
486 | else | 486 | else |
487 | presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); | 487 | presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n"); |
488 | 488 | ||
489 | // ...and close on our side | 489 | // ...and close on our side |
490 | presence.Scene.IncomingCloseAgent(presence.UUID); | 490 | presence.Scene.IncomingCloseAgent(presence.UUID); |
@@ -1228,7 +1228,7 @@ namespace OpenSim | |||
1228 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); | 1228 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); |
1229 | } | 1229 | } |
1230 | } | 1230 | } |
1231 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); | 1231 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); |
1232 | } | 1232 | } |
1233 | else | 1233 | else |
1234 | { | 1234 | { |