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 7087cb0..5ff9a38 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -456,7 +456,7 @@ namespace OpenSim | |||
456 | if (alert != null) | 456 | if (alert != null) |
457 | presence.ControllingClient.Kick(alert); | 457 | presence.ControllingClient.Kick(alert); |
458 | else | 458 | else |
459 | presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); | 459 | presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n"); |
460 | 460 | ||
461 | // ...and close on our side | 461 | // ...and close on our side |
462 | presence.Scene.IncomingCloseAgent(presence.UUID); | 462 | presence.Scene.IncomingCloseAgent(presence.UUID); |
@@ -1157,7 +1157,7 @@ namespace OpenSim | |||
1157 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); | 1157 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); |
1158 | } | 1158 | } |
1159 | } | 1159 | } |
1160 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); | 1160 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); |
1161 | } | 1161 | } |
1162 | else | 1162 | else |
1163 | { | 1163 | { |