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